Follow output changes (braces in do-notation)

8 files changed, 61 insertions, 61 deletions

diff --git a/testsuite/tests/ghc-regress/arrows/should_fail/T2111.stderr b/testsuite/tests/ghc-regress/arrows/should_fail/T2111.stderr
index cf654dd367..2989759ae5 100644
--- a/testsuite/tests/ghc-regress/arrows/should_fail/T2111.stderr
+++ b/testsuite/tests/ghc-regress/arrows/should_fail/T2111.stderr
@@ -3,18 +3,18 @@ T2111.hs:6:11:
     Illegal 'rec' stmt in a 'do' expression
     In a stmt of a 'do' expression: rec {x <- undefined -< x}
     In the expression:
-        do rec {x <- undefined -< x}
-           undefined -< x
+        do { rec {x <- undefined -< x};
+             undefined -< x }
     In the definition of `foo':
-        foo = do rec {x <- undefined -< x}
-                 undefined -< x
+        foo = do { rec {x <- undefined -< x};
+                   undefined -< x }
 
 T2111.hs:8:12:
     Illegal 'rec' stmt in a 'do' expression
     In a stmt of a 'do' expression: rec {x <- return ('a' : x)}
     In the expression:
-        do rec {x <- return ('a' : x)}
-           putStrLn (take 20 x)
+        do { rec {x <- return ('a' : x)};
+             putStrLn (take 20 x) }
     In the definition of `bar1':
-        bar1 = do rec {x <- return ('a' : x)}
-                  putStrLn (take 20 x)
+        bar1 = do { rec {x <- return ('a' : x)};
+                    putStrLn (take 20 x) }
diff --git a/testsuite/tests/ghc-regress/arrows/should_fail/arrowfail004.stderr b/testsuite/tests/ghc-regress/arrows/should_fail/arrowfail004.stderr
index 3070dfca68..9a9b7489b9 100644
--- a/testsuite/tests/ghc-regress/arrows/should_fail/arrowfail004.stderr
+++ b/testsuite/tests/ghc-regress/arrows/should_fail/arrowfail004.stderr
@@ -3,6 +3,6 @@ arrowfail004.hs:12:14:
     Illegal constructor `T' in a 'proc' pattern
       Proc patterns cannot use existentials or GADTs
     In the pattern: T x
-    In the expression: proc (T x) -> do returnA -< T x
+    In the expression: proc (T x) -> do { returnA -< T x }
     In the definition of `panic':
-        panic = proc (T x) -> do returnA -< T x
+        panic = proc (T x) -> do { returnA -< T x }
diff --git a/testsuite/tests/ghc-regress/mdo/should_fail/mdofail004.stderr b/testsuite/tests/ghc-regress/mdo/should_fail/mdofail004.stderr
index 45f11e8b53..a8ed1c5c8d 100644
--- a/testsuite/tests/ghc-regress/mdo/should_fail/mdofail004.stderr
+++ b/testsuite/tests/ghc-regress/mdo/should_fail/mdofail004.stderr
@@ -3,5 +3,5 @@ mdofail004.hs:17:4:
     No instance for (MonadFix X)
       arising from a do statement at mdofail004.hs:17:4-23
     Possible fix: add an instance declaration for (MonadFix X)
-    In the expression: mdo return [1, 2, ....]
-    In the definition of `z': z = mdo return [1, ....]
+    In the expression: mdo { return [1, 2, ....] }
+    In the definition of `z': z = mdo { return [1, ....] }
diff --git a/testsuite/tests/ghc-regress/rebindable/DoParamM.stderr b/testsuite/tests/ghc-regress/rebindable/DoParamM.stderr
index 424d7f4621..57448f4f85 100644
--- a/testsuite/tests/ghc-regress/rebindable/DoParamM.stderr
+++ b/testsuite/tests/ghc-regress/rebindable/DoParamM.stderr
@@ -12,8 +12,8 @@ DoParamM.hs:286:27:
       Inferred type: LIO Unlocked Locked ()
     In the expression: tlock2_do
     In the expression:
-        do tlock2_do
-           tlock2_do
+        do { tlock2_do;
+             tlock2_do }
 
 DoParamM.hs:302:36:
     Couldn't match expected type `Unlocked'
@@ -22,6 +22,6 @@ DoParamM.hs:302:36:
       Inferred type: LIO Locked Unlocked ()
     In the expression: unlock
     In the expression:
-        do tlock2_do
-           unlock
-           unlock
+        do { tlock2_do;
+             unlock;
+             unlock }
diff --git a/testsuite/tests/ghc-regress/rebindable/rebindable6.stderr b/testsuite/tests/ghc-regress/rebindable/rebindable6.stderr
index 72d418f39b..a5a55e8ac9 100644
--- a/testsuite/tests/ghc-regress/rebindable/rebindable6.stderr
+++ b/testsuite/tests/ghc-regress/rebindable/rebindable6.stderr
@@ -8,14 +8,14 @@ rebindable6.hs:106:2:
       or add an instance declaration for (HasSeq (IO a -> t -> IO b))
     In a stmt of a 'do' expression: f
     In the expression:
-        do f
-           Just (b :: b) <- g
-           return b
+        do { f;
+             Just (b :: b) <- g;
+             return b }
     In the definition of `test_do':
         test_do f g
-                  = do f
-                       Just (b :: b) <- g
-                       return b
+                  = do { f;
+                         Just (b :: b) <- g;
+                         return b }
 
 rebindable6.hs:107:2:
     No instance for (HasFail ([Prelude.Char] -> t1))
@@ -24,14 +24,14 @@ rebindable6.hs:107:2:
       add an instance declaration for (HasFail ([Prelude.Char] -> t1))
     In a stmt of a 'do' expression: Just (b :: b) <- g
     In the expression:
-        do f
-           Just (b :: b) <- g
-           return b
+        do { f;
+             Just (b :: b) <- g;
+             return b }
     In the definition of `test_do':
         test_do f g
-                  = do f
-                       Just (b :: b) <- g
-                       return b
+                  = do { f;
+                         Just (b :: b) <- g;
+                         return b }
 
 rebindable6.hs:107:2:
     Could not deduce (HasBind (IO (Maybe b) -> (Maybe b -> t1) -> t))
@@ -45,14 +45,14 @@ rebindable6.hs:107:2:
          (HasBind (IO (Maybe b) -> (Maybe b -> t1) -> t))
     In a stmt of a 'do' expression: Just (b :: b) <- g
     In the expression:
-        do f
-           Just (b :: b) <- g
-           return b
+        do { f;
+             Just (b :: b) <- g;
+             return b }
     In the definition of `test_do':
         test_do f g
-                  = do f
-                       Just (b :: b) <- g
-                       return b
+                  = do { f;
+                         Just (b :: b) <- g;
+                         return b }
 
 rebindable6.hs:108:2:
     Could not deduce (HasReturn (b -> t1)) from the context ()
@@ -63,11 +63,11 @@ rebindable6.hs:108:2:
       or add an instance declaration for (HasReturn (b -> t1))
     In the expression: return b
     In the expression:
-        do f
-           Just (b :: b) <- g
-           return b
+        do { f;
+             Just (b :: b) <- g;
+             return b }
     In the definition of `test_do':
         test_do f g
-                  = do f
-                       Just (b :: b) <- g
-                       return b
+                  = do { f;
+                         Just (b :: b) <- g;
+                         return b }
diff --git a/testsuite/tests/ghc-regress/th/TH_exn2.stderr b/testsuite/tests/ghc-regress/th/TH_exn2.stderr
index 403707f216..7a1a494085 100644
--- a/testsuite/tests/ghc-regress/th/TH_exn2.stderr
+++ b/testsuite/tests/ghc-regress/th/TH_exn2.stderr
@@ -8,5 +8,5 @@ TH_exn2.hs:1:0:
               return = return
               ....
             in
-              do ds <- [d| |]
-                 return (tail ds)
+              do { ds <- [d| |];
+                   return (tail ds) }
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail128.stderr b/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail128.stderr
index 3ed7555c1e..4c734dd346 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail128.stderr
+++ b/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail128.stderr
@@ -7,13 +7,13 @@ tcfail128.hs:18:8:
       (Data.Array.Base.MArray b FlatVector IO)
     In a stmt of a 'do' expression: v <- thaw tmp
     In the expression:
-        do let sL = ...
-               dim = length sL
-               ....
-           v <- thaw tmp
-           return ()
+        do { let sL = ...
+                 dim = length sL
+                 ....;
+             v <- thaw tmp;
+             return () }
     In the definition of `main':
-        main = do let sL = ...
-                      ....
-                  v <- thaw tmp
-                  return ()
+        main = do { let sL = ...
+                        ....;
+                    v <- thaw tmp;
+                    return () }
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail168.stderr b/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail168.stderr
index 027cb042c5..2a9befef27 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail168.stderr
+++ b/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail168.stderr
@@ -4,13 +4,13 @@ tcfail168.hs:8:10:
            against inferred type `Char -> ()'
     In a stmt of a 'do' expression: putChar 'a'
     In the expression:
-        do putChar
-           putChar 'a'
-           putChar 'a'
-           putChar 'a'
-           ....
+        do { putChar;
+             putChar 'a';
+             putChar 'a';
+             putChar 'a';
+             .... }
     In the definition of `foo':
-        foo = do putChar
-                 putChar 'a'
-                 putChar 'a'
-                 ....
+        foo = do { putChar;
+                   putChar 'a';
+                   putChar 'a';
+                   .... }