Merge pull request #5838 from unisonweb/topic/type-errors

Missing transcript update from #5837

Author: aryairani

parser-typechecker/src/Unison/PrintError.hs

@@ -346,14 +346,15 @@ renderTypeError e env src = case e of
             "",
             Pr.indentN 4 . style Type1 $ renderType' env foundType,
             "",
-            showSourceMaybes src
+            showSourceMaybes
+              src
               [(,Type1) <$> rangeForAnnotated mismatchSite],
             Pr.wrap . mconcat $
-            [ "All actions are expected to have a type of",
-              style Type2 "Unit",
-              "to catch accidental delayed values. To explicitly",
-              "ignore a result, use:"
-            ],
+              [ "All actions are expected to have a type of",
+                style Type2 "Unit",
+                "to catch accidental delayed values. To explicitly",
+                "ignore a result, use:"
+              ],
             "",
             Pr.indentN 4 $ style Type1 "_ = <expr>"
           ],

parser-typechecker/src/Unison/Typechecker/TypeError.hs

@@ -361,7 +361,7 @@ actionRestriction = do
   note <- Ex.errorNote
   mismatchSite <- Ex.innermostTerm
   path <- Ex.path
-  let subtypes = [ t1 | C.InSubtype t1 _ <- path ]
+  let subtypes = [t1 | C.InSubtype t1 _ <- path]
   guard . not $ null subtypes
   let foundType = Type.cleanup $ last subtypes
   pure $ ActionRestrictionFailure foundType mismatchSite note

unison-src/transcripts/idempotent/fix693.md

@@ -43,8 +43,8 @@ h0 req = match req with
 ``` ucm :added-by-ucm
   Loading changes detected in scratch.u.
 
-  I found a value  of type:  a
-  where I expected to find:  b
+  I found a value  of type:  Optional a
+  where I expected to find:  Optional b
 
       1 | h0 : Request {X t} b -> Optional b
       2 | h0 req = match req with
@@ -63,8 +63,8 @@ h1 req = match req with
 ``` ucm :added-by-ucm
   Loading changes detected in scratch.u.
 
-  I found a value  of type:  t
-  where I expected to find:  b
+  I found a value  of type:  Optional t
+  where I expected to find:  Optional b
 
       1 | h1 : Request {X t} b -> Optional b
       2 | h1 req = match req with