unnecessary builtins.mergeio

aryairani · aryairani · commit a987756b4194 · 2024-04-14T19:57:08.000-04:00
diff --git a/.gitignore b/.gitignore
@@ -11,6 +11,7 @@ interpreter-tests.md
 
 # Stack
 .stack-work
+.stack-work-hls
 
 # Cabal
 dist-newstyle
diff --git a/unison-src/transcripts-manual/scheme.md b/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
 ```
 
diff --git a/unison-src/transcripts-using-base/_base.md b/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
diff --git a/unison-src/transcripts-using-base/utf8.md b/unison-src/transcripts-using-base/utf8.md
@@ -2,7 +2,6 @@ Test for new Text -> Bytes conversions explicitly using UTF-8 as the encoding
 
 ```ucm:hide
 .> builtins.merge
-.> builtins.mergeio
 ```
 
 Unison has function for converting between `Text` and a UTF-8 `Bytes` encoding of the Text.
diff --git a/unison-src/transcripts/fix1800.md b/unison-src/transcripts/fix1800.md
@@ -1,6 +1,6 @@
 
 ```ucm:hide
-.> builtins.mergeio
+.> builtins.merge
 ```
 
 ```unison:hide
diff --git a/unison-src/transcripts/fix2187.md b/unison-src/transcripts/fix2187.md
@@ -1,19 +1,19 @@
 ```ucm:hide
-.> builtins.mergeio
+.> builtins.merge
 ```
 
-```unison 
+```unison
 
 lexicalScopeEx: [Text]
-lexicalScopeEx = 
+lexicalScopeEx =
   parent = "outer"
-  inner1 = let 
+  inner1 = let
     child1 = "child1"
     inner2 : [Text]
-    inner2 = let 
+    inner2 = let
       child2 = "child2"
       [parent, child1, child2]
     inner2
   inner1
 
-```
+```
diff --git a/unison-src/transcripts/fix2334.md b/unison-src/transcripts/fix2334.md
@@ -3,7 +3,7 @@ Tests an issue where pattern matching matrices involving built-in
 types was discarding default cases in some branches.
 
 ```ucm:hide
-.> builtins.mergeio
+.> builtins.merge
 ```
 
 ```unison
diff --git a/unison-src/transcripts/fix2474.md b/unison-src/transcripts/fix2474.md
@@ -18,17 +18,17 @@ should be typed in the following way:
      the ability that contains `e`.
 
 ```ucm
-.> builtins.mergeio
+.> builtins.merge
 ```
 
 ```unison
-structural ability Stream a where 
+structural ability Stream a where
   emit : a -> ()
 
 Stream.uncons : '{Stream a, g} r ->{g} Either r (a, '{Stream a, g} r)
-Stream.uncons s = 
+Stream.uncons s =
   go : Request {Stream a,g} r -> Either r (a, '{Stream a,g} r)
-  go = cases 
+  go = cases
     { r } -> Left r
     { Stream.emit a -> tl } -> Right (a, tl : '{Stream a,g} r)
   handle !s with go
diff --git a/unison-src/transcripts/fix2474.output.md b/unison-src/transcripts/fix2474.output.md
@@ -18,19 +18,19 @@ should be typed in the following way:
      the ability that contains `e`.
 
 ```ucm
-.> builtins.mergeio
+.> builtins.merge
 
   Done.
 
 ```
 ```unison
-structural ability Stream a where 
+structural ability Stream a where
   emit : a -> ()
 
 Stream.uncons : '{Stream a, g} r ->{g} Either r (a, '{Stream a, g} r)
-Stream.uncons s = 
+Stream.uncons s =
   go : Request {Stream a,g} r -> Either r (a, '{Stream a,g} r)
-  go = cases 
+  go = cases
     { r } -> Left r
     { Stream.emit a -> tl } -> Right (a, tl : '{Stream a,g} r)
   handle !s with go
diff --git a/unison-src/transcripts/fix3678.md b/unison-src/transcripts/fix3678.md
@@ -1,6 +1,6 @@
 
 ```ucm:hide
-.> builtins.mergeio
+.> builtins.merge
 ```
 
 Array comparison was indexing out of bounds.
diff --git a/unison-src/transcripts/fix4528.md b/unison-src/transcripts/fix4528.md
@@ -1,6 +1,6 @@
 ```ucm:hide
 .> project.create-empty foo
-foo/main> builtins.mergeio
+foo/main> builtins.merge
 ```
 
 ```unison
diff --git a/unison-src/transcripts/move-all.md b/unison-src/transcripts/move-all.md
@@ -1,7 +1,7 @@
 # Tests for `move`
 
 ```ucm:hide
-.> builtins.mergeio
+.> builtins.merge
 ```
 
 ## Happy Path - namespace, term, and type
diff --git a/unison-src/transcripts/move-all.output.md b/unison-src/transcripts/move-all.output.md
@@ -80,7 +80,7 @@ Should be able to move the term, type, and namespace, including its types, terms
   1. Bar      (Nat)
   2. Bar      (type)
   3. Bar/     (4 terms, 1 type)
-  4. builtin/ (628 terms, 89 types)
+  4. builtin/ (456 terms, 71 types)
 
 .> ls Bar
 
diff --git a/unison-src/transcripts/patternMatchTls.md b/unison-src/transcripts/patternMatchTls.md
@@ -1,9 +1,8 @@
 ```ucm:hide
 .> builtins.merge
-.> builtins.mergeio
 ```
 
-We had bugs in the calling conventions for both send and terminate which would 
+We had bugs in the calling conventions for both send and terminate which would
 cause pattern matching on the resulting (Right ()) would cause a runtime error.
 
 
@@ -12,7 +11,7 @@ cause pattern matching on the resulting (Right ()) would cause a runtime error.
 use builtin.io2.Tls newClient send handshake terminate
 
 frank: '{IO} ()
-frank = do 
+frank = do
   socket = assertRight (clientSocket.impl "example.com" "443")
   config = ClientConfig.default "example.com" 0xs
   tls = assertRight (newClient.impl config socket)
diff --git a/unison-src/transcripts/patternMatchTls.output.md b/unison-src/transcripts/patternMatchTls.output.md
@@ -1,4 +1,4 @@
-We had bugs in the calling conventions for both send and terminate which would 
+We had bugs in the calling conventions for both send and terminate which would
 cause pattern matching on the resulting (Right ()) would cause a runtime error.
 
 
@@ -7,7 +7,7 @@ cause pattern matching on the resulting (Right ()) would cause a runtime error.
 use builtin.io2.Tls newClient send handshake terminate
 
 frank: '{IO} ()
-frank = do 
+frank = do
   socket = assertRight (clientSocket.impl "example.com" "443")
   config = ClientConfig.default "example.com" 0xs
   tls = assertRight (newClient.impl config socket)
diff --git a/unison-src/transcripts/records.md b/unison-src/transcripts/records.md
@@ -1,7 +1,7 @@
-Ensure that Records keep their syntax after being added to the codebase 
+Ensure that Records keep their syntax after being added to the codebase
 
 ```ucm:hide
-.> builtins.mergeio
+.> builtins.merge
 .> load unison-src/transcripts-using-base/base.u
 ```
 
@@ -50,7 +50,7 @@ unique type Record3 = { a : Text, b : Int, c : Nat }
 ## Record with many fields
 
 ```unison:hide
-unique type Record4 = 
+unique type Record4 =
   { a : Text
   , b : Int
   , c : Nat
@@ -131,8 +131,8 @@ If you `view` or `edit` it, it _should_ be treated as a record type, but it does
 Trailing commas are allowed.
 
 ```unison
-unique type Record5 = 
-  { a : Text, 
+unique type Record5 =
+  { a : Text,
     b : Int,
   }
 ```
diff --git a/unison-src/transcripts/records.output.md b/unison-src/transcripts/records.output.md
@@ -1,4 +1,4 @@
-Ensure that Records keep their syntax after being added to the codebase 
+Ensure that Records keep their syntax after being added to the codebase
 
 ## Record with 1 field
 
@@ -39,7 +39,7 @@ unique type Record3 = { a : Text, b : Int, c : Nat }
 ## Record with many fields
 
 ```unison
-unique type Record4 = 
+unique type Record4 =
   { a : Text
   , b : Int
   , c : Nat
@@ -142,8 +142,8 @@ If you `view` or `edit` it, it _should_ be treated as a record type, but it does
 Trailing commas are allowed.
 
 ```unison
-unique type Record5 = 
-  { a : Text, 
+unique type Record5 =
+  { a : Text,
     b : Int,
   }
 ```
diff --git a/unison-src/transcripts/scope-ref.md b/unison-src/transcripts/scope-ref.md
@@ -2,7 +2,7 @@
 A short script to test mutable references with local scope.
 
 ```ucm:hide
-.> builtins.mergeio
+.> builtins.merge
 ```
 
 ```unison
diff --git a/unison-src/transcripts/universal-cmp.md b/unison-src/transcripts/universal-cmp.md
@@ -3,7 +3,7 @@ File for test cases making sure that universal equality/comparison
 cases exist for built-in types. Just making sure they don't crash.
 
 ```ucm:hide
-.> builtins.mergeio
+.> builtins.merge
 ```
 
 ```unison
diff --git a/unison-src/transcripts/unsafe-coerce.md b/unison-src/transcripts/unsafe-coerce.md
@@ -1,6 +1,6 @@
 
 ```ucm:hide
-.> builtins.mergeio
+.> builtins.merge
 ```
 
 ```unison
diff --git a/unison-src/transcripts/update-test-to-non-test.md b/unison-src/transcripts/update-test-to-non-test.md
@@ -1,5 +1,5 @@
 ```ucm
-.> builtins.mergeio
+.> builtins.merge
 ```
 
 ```unison
diff --git a/unison-src/transcripts/update-test-to-non-test.output.md b/unison-src/transcripts/update-test-to-non-test.output.md
@@ -1,5 +1,5 @@
 ```ucm
-.> builtins.mergeio
+.> builtins.merge
 
   Done.
 
diff --git a/unison-src/transcripts/update-test-watch-roundtrip.md b/unison-src/transcripts/update-test-watch-roundtrip.md
@@ -1,6 +1,6 @@
 
 ```ucm:hide
-.> builtins.mergeio
+.> builtins.merge
 ```
 
 Given a test that depends on another definition,
