Follow column number changes

testsuite/tests/ghc-regress/annotations/should_fail/annfail01.stderr

 
-annfail01.hs:4:0: Not in scope: type constructor or class `Foo'
+annfail01.hs:4:1: Not in scope: type constructor or class `Foo'
 
-annfail01.hs:5:0: Not in scope: `f'
+annfail01.hs:5:1: Not in scope: `f'

testsuite/tests/ghc-regress/annotations/should_fail/annfail02.stderr

 
-annfail02.hs:6:0: Not in scope: data constructor `Foo'
+annfail02.hs:6:1: Not in scope: data constructor `Foo'
 
-annfail02.hs:7:0: Not in scope: type constructor or class `Bar'
+annfail02.hs:7:1: Not in scope: type constructor or class `Bar'

testsuite/tests/ghc-regress/annotations/should_fail/annfail03.stderr

-
-annfail03.hs:17:0:
-    GHC stage restriction: instance for `Data InModule'
-      is used in a top-level splice or annotation,
-      and must be imported, not defined locally
-    In the expression: InModule
-    In the annotation: {-# ANN f InModule #-}
+
+annfail03.hs:17:1:
+    GHC stage restriction: instance for `Data InModule'
+      is used in a top-level splice or annotation,
+      and must be imported, not defined locally
+    In the expression: InModule
+    In the annotation: {-# ANN f InModule #-}

testsuite/tests/ghc-regress/annotations/should_fail/annfail04.stderr

-
-annfail04.hs:14:11:
-    GHC stage restriction: instance for `Thing Int'
-      is used in a top-level splice or annotation,
-      and must be imported, not defined locally
-    In the expression: (thing :: Int)
-    In the annotation: {-# ANN f (thing :: Int) #-}
+
+annfail04.hs:14:12:
+    GHC stage restriction: instance for `Thing Int'
+      is used in a top-level splice or annotation,
+      and must be imported, not defined locally
+    In the expression: (thing :: Int)
+    In the annotation: {-# ANN f (thing :: Int) #-}

testsuite/tests/ghc-regress/annotations/should_fail/annfail05.stderr

 
-annfail05.hs:11:0:
+annfail05.hs:11:1:
     No instance for (Data.Data.Data NoInstances)
-      arising from an annotation at annfail05.hs:11:0-24
+      arising from an annotation at annfail05.hs:11:1-25
     Possible fix:
       add an instance declaration for (Data.Data.Data NoInstances)
     In the expression: NoInstances

testsuite/tests/ghc-regress/annotations/should_fail/annfail06.stderr

-
-annfail06.hs:21:0:
-    GHC stage restriction: instance for `Data InstancesInWrongModule'
-      is used in a top-level splice or annotation,
-      and must be imported, not defined locally
-    In the expression: InstancesInWrongModule
-    In the annotation: {-# ANN f InstancesInWrongModule #-}
+
+annfail06.hs:21:1:
+    GHC stage restriction: instance for `Data InstancesInWrongModule'
+      is used in a top-level splice or annotation,
+      and must be imported, not defined locally
+    In the expression: InstancesInWrongModule
+    In the annotation: {-# ANN f InstancesInWrongModule #-}

testsuite/tests/ghc-regress/annotations/should_fail/annfail07.stderr

 
-annfail07.hs:9:16:
+annfail07.hs:9:17:
     Couldn't match expected type `[a]' against inferred type `Bool'
     In the first argument of `head', namely `True'
     In the expression: (head True)

testsuite/tests/ghc-regress/annotations/should_fail/annfail08.stderr

 
-annfail08.hs:9:0:
+annfail08.hs:9:1:
     No instance for (Data.Data.Data (a -> a))
-      arising from an annotation at annfail08.hs:9:0-21
+      arising from an annotation at annfail08.hs:9:1-22
     Possible fix:
       add an instance declaration for (Data.Data.Data (a -> a))
     In the expression: (id + 1)
     In the annotation: {-# ANN f (id + 1) #-}
 
-annfail08.hs:9:16:
+annfail08.hs:9:17:
     No instance for (Num (a -> a))
-      arising from the literal `1' at annfail08.hs:9:16
+      arising from the literal `1' at annfail08.hs:9:17
     Possible fix: add an instance declaration for (Num (a -> a))
     In the second argument of `(+)', namely `1'
     In the expression: (id + 1)

testsuite/tests/ghc-regress/annotations/should_fail/annfail09.stderr

-
-annfail09.hs:11:10:
-    GHC stage restriction: `g'
-      is used in a top-level splice or annotation,
-      and must be imported, not defined locally
-    In the expression: g
-    In the annotation: {-# ANN f g #-}
+
+annfail09.hs:11:11:
+    GHC stage restriction: `g'
+      is used in a top-level splice or annotation,
+      and must be imported, not defined locally
+    In the expression: g
+    In the annotation: {-# ANN f g #-}

testsuite/tests/ghc-regress/annotations/should_fail/annfail10.stderr

 
-annfail10.hs:9:10:
+annfail10.hs:9:11:
     Ambiguous type variable `t' in the constraints:
-      `Num t' arising from the literal `1' at annfail10.hs:9:10
+      `Num t' arising from the literal `1' at annfail10.hs:9:11
       `Data.Data.Data t'
-        arising from an annotation at annfail10.hs:9:0-14
+        arising from an annotation at annfail10.hs:9:1-15
     Probable fix: add a type signature that fixes these type variable(s)
     In the expression: 1
     In the annotation: {-# ANN f 1 #-}

testsuite/tests/ghc-regress/annotations/should_fail/annfail11.stderr

 
-annfail11.hs:3:0: Not in scope: `length'
+annfail11.hs:3:1: Not in scope: `length'
 
-annfail11.hs:4:0: Not in scope: type constructor or class `Integer'
+annfail11.hs:4:1: Not in scope: type constructor or class `Integer'

testsuite/tests/ghc-regress/annotations/should_fail/annfail12.stderr

-
-annfail12.hs:5:0:
-    Exception when trying to run compile-time code:
-      You were meant to see this error!
-    In the expression:
-        (error "You were meant to see this error!" :: Int)
-    In the annotation:
-        {-# ANN f (error "You were meant to see this error!" :: Int) #-}
+
+annfail12.hs:5:1:
+    Exception when trying to run compile-time code:
+      You were meant to see this error!
+    In the expression:
+        (error "You were meant to see this error!" :: Int)
+    In the annotation:
+        {-# ANN f (error "You were meant to see this error!" :: Int) #-}

testsuite/tests/ghc-regress/annotations/should_fail/annfail13.stderr

 
-annfail13.hs:4:13: parse error on input `1'
+annfail13.hs:4:14: parse error on input `1'

testsuite/tests/ghc-regress/arrows/should_fail/T2111.stderr

-
-T2111.hs:6:22:
-    The arrow command
-      undefined -< x
-    was found where an expression was expected
-    In a stmt of a 'do' expression: x <- undefined -< x
-    In a stmt of a 'do' expression: rec {x <- undefined -< x}
-    In the expression:
-        do { rec {x <- undefined -< x};
-             undefined -< x }
+
+T2111.hs:6:23:
+    The arrow command
+      undefined -< x
+    was found where an expression was expected
+    In a stmt of a 'do' expression: x <- undefined -< x
+    In a stmt of a 'do' expression: rec {x <- undefined -< x}
+    In the expression:
+        do { rec {x <- undefined -< x};
+             undefined -< x }

testsuite/tests/ghc-regress/arrows/should_fail/arrowfail001.stderr

 
-arrowfail001.hs:16:35:
+arrowfail001.hs:16:36:
     Ambiguous type variable `a' in the constraint:
-      `Foo a' arising from a use of `foo' at arrowfail001.hs:16:35-37
+      `Foo a' arising from a use of `foo' at arrowfail001.hs:16:36-38
     Probable fix: add a type signature that fixes these type variable(s)

testsuite/tests/ghc-regress/arrows/should_fail/arrowfail002.stderr

 
-arrowfail002.hs:6:16: Not in scope: `x'
+arrowfail002.hs:6:17: Not in scope: `x'

testsuite/tests/ghc-regress/arrows/should_fail/arrowfail003.stderr

 
-arrowfail003.hs:8:6:
+arrowfail003.hs:8:7:
     The arrow command
       returnA -< []
     was found where an expression was expected
     In the expression: returnA -< []
     In the definition of `foo': foo = returnA -< []
 
-arrowfail003.hs:9:6:
+arrowfail003.hs:9:7:
     The arrow command
       (|zeroArrow |)
     was found where an expression was expected

testsuite/tests/ghc-regress/arrows/should_fail/arrowfail004.stderr

 
-arrowfail004.hs:12:14:
+arrowfail004.hs:12:15:
     Illegal constructor `T' in a 'proc' pattern
       Proc patterns cannot use existentials or GADTs
     In the pattern: T x

testsuite/tests/ghc-regress/deSugar/should_compile/GadtOverlap.stderr

-
-GadtOverlap.hs:19:0:
-    Warning: Pattern match(es) are non-exhaustive
-             In the definition of `h': Patterns not matched: T3
+
+GadtOverlap.hs:19:1:
+    Warning: Pattern match(es) are non-exhaustive
+             In the definition of `h': Patterns not matched: T3

testsuite/tests/ghc-regress/deSugar/should_compile/T2395.stderr

 
-T2395.hs:12:0:
+T2395.hs:12:1:
     Warning: Pattern match(es) are overlapped
              In the definition of `bar': bar _ = ...

testsuite/tests/ghc-regress/deSugar/should_compile/T3263-1.stderr

-
-on the commandline:
-    Warning: -XRecursiveDo is deprecated: use -XDoRec or pragma {-# LANGUAGE DoRec #-} instead
-
-T3263-1.hs:25:2:
-    Warning: A do-notation statement discarded a result of type Int.
-             Suppress this warning by saying "_ <- nonNullM",
-             or by using the flag -fno-warn-unused-do-bind
-
-T3263-1.hs:35:2:
-    Warning: A do-notation statement discarded a result of type Int.
-             Suppress this warning by saying "_ <- nonNullM",
-             or by using the flag -fno-warn-unused-do-bind
+
+on the commandline:
+    Warning: -XRecursiveDo is deprecated: use -XDoRec or pragma {-# LANGUAGE DoRec #-} instead
+
+T3263-1.hs:25:3:
+    Warning: A do-notation statement discarded a result of type Int.
+             Suppress this warning by saying "_ <- nonNullM",
+             or by using the flag -fno-warn-unused-do-bind
+
+T3263-1.hs:35:3:
+    Warning: A do-notation statement discarded a result of type Int.
+             Suppress this warning by saying "_ <- nonNullM",
+             or by using the flag -fno-warn-unused-do-bind

testsuite/tests/ghc-regress/deSugar/should_compile/T3263-2.stderr

-
-on the commandline:
-    Warning: -XRecursiveDo is deprecated: use -XDoRec or pragma {-# LANGUAGE DoRec #-} instead
-
-T3263-2.hs:25:2:
-    Warning: A do-notation statement discarded a result of type m Int.
-             Suppress this warning by saying "_ <- return (return 10 :: m Int)",
-             or by using the flag -fno-warn-wrong-do-bind
-
-T3263-2.hs:37:2:
-    Warning: A do-notation statement discarded a result of type m Int.
-             Suppress this warning by saying "_ <- return (return 10 :: m Int)",
-             or by using the flag -fno-warn-wrong-do-bind
+
+on the commandline:
+    Warning: -XRecursiveDo is deprecated: use -XDoRec or pragma {-# LANGUAGE DoRec #-} instead
+
+T3263-2.hs:25:3:
+    Warning: A do-notation statement discarded a result of type m Int.
+             Suppress this warning by saying "_ <- return (return 10 :: m Int)",
+             or by using the flag -fno-warn-wrong-do-bind
+
+T3263-2.hs:37:3:
+    Warning: A do-notation statement discarded a result of type m Int.
+             Suppress this warning by saying "_ <- return (return 10 :: m Int)",
+             or by using the flag -fno-warn-wrong-do-bind

testsuite/tests/ghc-regress/deSugar/should_compile/ds002.stderr-ghc

 
-ds002.hs:7:0:
+ds002.hs:7:1:
     Warning: Pattern match(es) are overlapped
 	     In the definition of `f':
 		 f y = ...
 		 f z = ...
 
-ds002.hs:11:0:
+ds002.hs:11:1:
     Warning: Pattern match(es) are overlapped
 	     In the definition of `g': g x y z = ...

testsuite/tests/ghc-regress/deSugar/should_compile/ds003.stderr-ghc

 
-ds003.hs:5:0:
+ds003.hs:5:1:
     Warning: Pattern match(es) are overlapped
 	     In the definition of `f':
 		 f (x : x1 : x2 : x3) ~(y, ys) z = ...

testsuite/tests/ghc-regress/deSugar/should_compile/ds019.stderr-ghc

 
-ds019.hs:5:0:
+ds019.hs:5:1:
     Warning: Pattern match(es) are overlapped
 	     In the definition of `f':
 		 f d (j, k) p = ...

testsuite/tests/ghc-regress/deSugar/should_compile/ds020.stderr-ghc

 
-ds020.hs:5:0:
+ds020.hs:5:1:
     Warning: Pattern match(es) are overlapped
 	     In the definition of `a': a ~(~[], ~[], ~[]) = ...
 
-ds020.hs:8:0:
+ds020.hs:8:1:
     Warning: Pattern match(es) are overlapped
 	     In the definition of `b': b ~(~x : ~xs : ~ys) = ...
 
-ds020.hs:13:0:
+ds020.hs:13:1:
     Warning: Pattern match(es) are overlapped
 	     In the definition of `d':
 		 d ~(n+43) = ...
 		 d ~(n+999) = ...
 
-ds020.hs:19:0:
+ds020.hs:19:1:
     Warning: Pattern match(es) are overlapped
 	     In the definition of `f': f (x@(~[])) = ...

testsuite/tests/ghc-regress/deSugar/should_compile/ds022.stderr-ghc

 
-ds022.hs:20:0:
+ds022.hs:20:1:
     Warning: Pattern match(es) are overlapped
 	     In the definition of `i':
 		 i 1 1.1 = ...

testsuite/tests/ghc-regress/deSugar/should_compile/ds041.stderr-ghc

 
-ds041.hs:15:6:
+ds041.hs:15:7:
     Warning: Fields of `Foo' not initialised: x
 	     In the expression: Foo {}
 	     In the definition of `foo': foo = Foo {}

testsuite/tests/ghc-regress/deSugar/should_compile/ds043.stderr-ghc

 
-ds043.hs:8:1:
+ds043.hs:8:2:
     Warning: Pattern match(es) are overlapped
 	     In a case alternative: B {e = True, f = False} -> ...

testsuite/tests/ghc-regress/deSugar/should_compile/ds051.stderr-ghc

 
-ds051.hs:6:0:
+ds051.hs:6:1:
     Warning: Pattern match(es) are overlapped
 	     In the definition of `f1': f1 "ab" = ...
 
-ds051.hs:11:0:
+ds051.hs:11:1:
     Warning: Pattern match(es) are overlapped
 	     In the definition of `f2': f2 ('a' : 'b' : []) = ...
 
-ds051.hs:16:0:
+ds051.hs:16:1:
     Warning: Pattern match(es) are overlapped
 	     In the definition of `f3': f3 "ab" = ...

testsuite/tests/ghc-regress/deSugar/should_compile/ds053.stderr-ghc

 
-ds053.hs:5:0: Warning: Defined but not used: `f'
+ds053.hs:5:1: Warning: Defined but not used: `f'

testsuite/tests/ghc-regress/deSugar/should_compile/ds056.stderr

 
-ds056.hs:6:0:
+ds056.hs:6:1:
     Warning: Pattern match(es) are overlapped
 	     In the definition of `g': g _ = ...

testsuite/tests/ghc-regress/deSugar/should_compile/ds058.stderr

 
-ds058.hs:5:6:
+ds058.hs:5:7:
     Warning: Pattern match(es) are overlapped
 	     In a case alternative: Just _ -> ...

testsuite/tests/ghc-regress/deSugar/should_run/dsrun005.stderr

-dsrun005: dsrun005.hs:42:0-17: Non-exhaustive patterns in function f
+dsrun005: dsrun005.hs:42:1-18: Non-exhaustive patterns in function f
 

testsuite/tests/ghc-regress/deSugar/should_run/dsrun007.stderr

-dsrun007: dsrun007.hs:5:22-24: Missing field in record construction 
+dsrun007: dsrun007.hs:5:23-25: Missing field in record construction 
 

testsuite/tests/ghc-regress/deSugar/should_run/dsrun008.stderr

-dsrun008: dsrun008.hs:2:14-41: Irrefutable pattern failed for pattern (2, x)
+dsrun008: dsrun008.hs:2:15-42: Irrefutable pattern failed for pattern (2, x)
 

testsuite/tests/ghc-regress/driver/1372/1372.stderr

 
-Main.hs:5:4: Not in scope: data constructor `T'
+Main.hs:5:5: Not in scope: data constructor `T'

testsuite/tests/ghc-regress/driver/2499.stderr

 
-2499.hs:1:11: unknown flag in  {-# OPTIONS #-} pragma: -package
+2499.hs:1:12: unknown flag in  {-# OPTIONS #-} pragma: -package
 
-2499.hs:1:11: unknown flag in  {-# OPTIONS #-} pragma: blargh
+2499.hs:1:12: unknown flag in  {-# OPTIONS #-} pragma: blargh

testsuite/tests/ghc-regress/driver/bug1677/bug1677.stderr

 
-Foo.hs:1:0:
+Foo.hs:1:1:
     File name does not match module name:
     Saw: `Main'
     Expected: `Foo'

testsuite/tests/ghc-regress/driver/driver063.stderr

 
-D.hs:2:7:
+D.hs:2:8:
     Could not find module `A':
       it is not a module in the current program, or in any known package.

testsuite/tests/ghc-regress/ffi/should_compile/1357.stderr

 
-1357.hs:5:0:
+1357.hs:5:1:
     Warning: possible missing & in foreign import of FunPtr

testsuite/tests/ghc-regress/ffi/should_fail/T3066.stderr

 
-T3066.hs:6:0:
+T3066.hs:6:1:
     Unacceptable argument type in foreign declaration: forall u. X u
     When checking declaration:
         foreign import ccall safe "static bla" bla

testsuite/tests/ghc-regress/ffi/should_fail/cc005.stderr

 
-cc005.hs:7:0:
+cc005.hs:7:1:
     Unacceptable argument type in foreign declaration: Int#
     When checking declaration: foreign export ccall "foo" foo :: Int# -> IO ()
 
-cc005.hs:10:0:
+cc005.hs:10:1:
     Unacceptable result type in foreign declaration: Int#
     When checking declaration: foreign export ccall "bar" bar :: Int -> Int#

testsuite/tests/ghc-regress/ffi/should_fail/ccfail001.stderr

 
-ccfail001.hs:10:0:
+ccfail001.hs:10:1:
     Unacceptable result type in foreign declaration: State# RealWorld
     When checking declaration:
         foreign import ccall safe "static foo" foo

testsuite/tests/ghc-regress/ffi/should_fail/ccfail002.stderr

 
-ccfail002.hs:10:0:
+ccfail002.hs:10:1:
     Unacceptable result type in foreign declaration:
         (# Int#, Int#, Int# #)
     When checking declaration:

testsuite/tests/ghc-regress/gadt/T3163.stderr

 
-T3163.hs:8:4:
+T3163.hs:8:5:
     Illegal polymorphic or qualified type: forall s. s
     In the definition of data constructor `Unreached'
     In the data type declaration for `Taker'

testsuite/tests/ghc-regress/gadt/gadt-escape1.stderr

 
-gadt-escape1.hs:16:52:
+gadt-escape1.hs:16:53:
     GADT pattern match with non-rigid result type `t'
       Solution: add a type signature for the entire case expression
     In a case alternative: Hidden (ExpInt _) a -> a

testsuite/tests/ghc-regress/gadt/gadt10.stderr

 
-gadt10.hs:6:23:
+gadt10.hs:6:24:
     `RInt' is not applied to enough type arguments
     Expected kind `?', but `RInt' has kind `k -> *'
     In the type `RInt'

testsuite/tests/ghc-regress/gadt/gadt11.stderr

-
-gadt11.hs:9:2:
-    Data constructor `B1' returns type `X []'
-      instead of an instance of its parent type `B a'
-    In the definition of data constructor `B1'
-    In the data type declaration for `B'
+
+gadt11.hs:9:3:
+    Data constructor `B1' returns type `X []'
+      instead of an instance of its parent type `B a'
+    In the definition of data constructor `B1'
+    In the data type declaration for `B'

testsuite/tests/ghc-regress/gadt/gadt13.stderr

 
-gadt13.hs:12:5:
+gadt13.hs:12:6:
     GADT pattern match in non-rigid context for `I'
       Probable solution: add a type signature for `shw'
     In the pattern: I t

testsuite/tests/ghc-regress/gadt/gadt21.stderr

 
-gadt21.hs:21:59:
+gadt21.hs:21:60:
     Could not deduce (Ord a1) from the context (a ~ Set a1)
-      arising from a use of `f' at gadt21.hs:21:59-61
+      arising from a use of `f' at gadt21.hs:21:60-62
     Possible fix:
       add (Ord a1) to the context of the constructor `TypeSet'
     In the first argument of `Just', namely `(f e)'

testsuite/tests/ghc-regress/gadt/gadt7.stderr

 
-gadt7.hs:12:31:
+gadt7.hs:12:32:
     GADT pattern match in non-rigid context for `K'
       Probable solution: add a type signature for the scrutinee of the case expression
     In the pattern: K
     In a case alternative: K -> y1
     In the expression: case t1 of { K -> y1 }
 
-gadt7.hs:15:32:
+gadt7.hs:15:33:
     GADT pattern match in non-rigid context for `K'
       Probable solution: add a type signature for the scrutinee of the case expression
     In the pattern: K

testsuite/tests/ghc-regress/gadt/lazypat.stderr

 
-lazypat.hs:7:2:
+lazypat.hs:7:3:
     A lazy (~) pattern cannot match existential or GADT data constructors
       `a' is a rigid type variable bound by
-          the constructor `T' at lazypat.hs:7:4
+          the constructor `T' at lazypat.hs:7:5
     In the pattern: ~(T x f)