Merge pull request #4885 from unisonweb/transcripts-cleanup

transcripts `mergeio` cleanup

Author: aryairani

.gitignore

@@ -11,6 +11,7 @@ interpreter-tests.md
 
 # Stack
 .stack-work
+.stack-work-hls
 
 # Cabal
 dist-newstyle

unison-src/transcripts-manual/scheme.md

@@ -2,7 +2,7 @@ This transcript executes very slowly, because the compiler has an
 entire copy of base (and other stuff) within it.
 
 ```ucm:hide
-.> builtins.mergeio
+.> builtins.merge
 .> pull.without-history unison.public.base.trunk base
 ```
 

unison-src/transcripts-using-base/_base.md

@@ -10,7 +10,6 @@ transcripts which contain less boilerplate.
 ## Usage
 
 ```ucm:hide
-.> builtins.merge
 .> builtins.mergeio
 .> load unison-src/transcripts-using-base/base.u
 .> add

unison-src/transcripts-using-base/binary-encoding-nats.md

@@ -1,12 +1,3 @@
-
-```ucm:hide
-.> builtins.merge
-.> builtins.mergeio
-.> load unison-src/transcripts-using-base/base.u
-.> add
-.> find
-```
-
 ```unison
 unique type EncDec = EncDec Text (Nat -> Bytes) (Bytes -> Optional (Nat, Bytes))
 

unison-src/transcripts-using-base/binary-encoding-nats.output.md

@@ -1,4 +1,3 @@
-
 ```unison
 unique type EncDec = EncDec Text (Nat -> Bytes) (Bytes -> Optional (Nat, Bytes))
 

unison-src/transcripts-using-base/codeops.md

@@ -1,10 +1,6 @@
 
 Test for code serialization operations.
 
-```ucm:hide
-.> builtins.merge
-```
-
 Define a function, serialize it, then deserialize it back to an actual
 function. Also ask for its dependencies for display later.
 
@@ -138,8 +134,8 @@ verified name link =
   with handleTest ("verified " ++ name)
 
 rejected : Text -> [(Link.Term,Code)] ->{io2.IO} Result
-rejected name rco = 
-  handle verify name rco 
+rejected name rco =
+  handle verify name rco
   with expectFailure ("rejected " ++ name)
 
 missed : Text -> Link.Term -> Result

unison-src/transcripts-using-base/codeops.output.md

@@ -134,8 +134,8 @@ verified name link =
   with handleTest ("verified " ++ name)
 
 rejected : Text -> [(Link.Term,Code)] ->{io2.IO} Result
-rejected name rco = 
-  handle verify name rco 
+rejected name rco =
+  handle verify name rco
   with expectFailure ("rejected " ++ name)
 
 missed : Text -> Link.Term -> Result

unison-src/transcripts-using-base/doc.md

@@ -1,9 +1,5 @@
 # Computable documents in Unison
 
-```ucm:hide
-.> builtins.mergeio
-```
-
 Unison documentation is written in Unison and has some neat features:
 
 * The documentation type provides a rich vocabulary of elements that go beyond markdown, including asides, callouts, tooltips, and more.

unison-src/transcripts-using-base/failure-tests.md

@@ -6,10 +6,6 @@ Exception ability directly, and the last is code validation. I don't
 have an easy way to test the last at the moment, but the other two are
 tested here.
 
-```ucm:hide
-.> builtins.mergeio
-```
-
 ```unison
 test1 : '{IO, Exception} [Result]
 test1 = do

unison-src/transcripts-using-base/fix2049.md

@@ -1,30 +0,0 @@
-```ucm:hide
-.> builtins.mergeio
-```
-
-Tests some capabilities for catching runtime exceptions.
-
-```unison
-catcher : '{IO} () ->{IO} Result
-catcher act =
-  handle tryEval act with cases
-    { raise _ -> _ } -> Ok "caught"
-    { _ } -> Fail "nothing to catch"
-
-tests _ =
-  [ catcher do
-      _ = 1/0
-      ()
-  , catcher '(bug "testing")
-  , handle tryEval (do 1+1) with cases
-      { raise _ -> _ } -> Fail "1+1 failed"
-      { 2 } -> Ok "got the right answer"
-      { _ } -> Fail "got the wrong answer"
-  ]
-```
-
-```ucm
-.> add
-.> io.test tests
-```
-