Error message wibbles when adding overloaded lists

18 files changed, 68 insertions, 67 deletions

diff --git a/testsuite/tests/codeGen/should_run/cgrun064.hs b/testsuite/tests/codeGen/should_run/cgrun064.hs
index aa037e8782..24544c4382 100644
--- a/testsuite/tests/codeGen/should_run/cgrun064.hs
+++ b/testsuite/tests/codeGen/should_run/cgrun064.hs
@@ -5,7 +5,7 @@
 
 module Main ( main ) where
 
-import GHC.Exts
+import GHC.Exts hiding (IsList(..))
 import GHC.Prim
 import GHC.ST
 
diff --git a/testsuite/tests/codeGen/should_run/cgrun068.hs b/testsuite/tests/codeGen/should_run/cgrun068.hs
index 9d9a0f954f..69a8b279f8 100644
--- a/testsuite/tests/codeGen/should_run/cgrun068.hs
+++ b/testsuite/tests/codeGen/should_run/cgrun068.hs
@@ -33,7 +33,7 @@ import Control.Exception (assert)
 import Control.Monad
 import Control.Monad.Trans.State.Strict
 import Control.Monad.Trans.Class
-import GHC.Exts
+import GHC.Exts hiding (IsList(..))
 import GHC.ST hiding (liftST)
 import Prelude hiding (length, read)
 import qualified Prelude as P
diff --git a/testsuite/tests/codeGen/should_run/cgrun070.hs b/testsuite/tests/codeGen/should_run/cgrun070.hs
index 1f6b5622ba..3187af6f67 100644
--- a/testsuite/tests/codeGen/should_run/cgrun070.hs
+++ b/testsuite/tests/codeGen/should_run/cgrun070.hs
@@ -6,7 +6,7 @@
 module Main ( main ) where
 
 import GHC.Word
-import GHC.Exts
+import GHC.Exts hiding (IsList(..))
 import GHC.Prim
 import GHC.ST
 
diff --git a/testsuite/tests/driver/T4437.hs b/testsuite/tests/driver/T4437.hs
index 23be89bfc4..617484c6cd 100644
--- a/testsuite/tests/driver/T4437.hs
+++ b/testsuite/tests/driver/T4437.hs
@@ -37,6 +37,7 @@ expectedGhcOnlyExtensions = [
                              "AlternativeLayoutRuleTransitional",
                              "ExplicitNamespaces",
                              "TypeHoles",
+                             "OverloadedLists",
                              "EmptyCase",
                              "AutoDeriveTypeable"]
 
diff --git a/testsuite/tests/driver/werror.stderr b/testsuite/tests/driver/werror.stderr
index c8e7894085..4bad5e6b44 100644
--- a/testsuite/tests/driver/werror.stderr
+++ b/testsuite/tests/driver/werror.stderr
@@ -1,10 +1,10 @@
 
-werror.hs:6:1:
-    Warning: Top-level binding with no type signature: main :: IO ()
+werror.hs:6:1: Warning:
+    Top-level binding with no type signature: main :: IO ()
 
-werror.hs:7:13:
-    Warning: This binding for `main' shadows the existing binding
-               defined at werror.hs:6:1
+werror.hs:7:13: Warning:
+    This binding for `main' shadows the existing binding
+      defined at werror.hs:6:1
 
 werror.hs:7:13: Warning: Defined but not used: `main'
 
@@ -12,17 +12,17 @@ werror.hs:8:1: Warning: Tab character
 
 werror.hs:10:1: Warning: Defined but not used: `f'
 
-werror.hs:10:1:
-    Warning: Top-level binding with no type signature:
-               f :: forall t a. [t] -> [a]
+werror.hs:10:1: Warning:
+    Top-level binding with no type signature:
+      f :: forall t t1. [t] -> [t1]
 
-werror.hs:10:1:
-    Warning: Pattern match(es) are overlapped
-             In an equation for `f': f [] = ...
+werror.hs:10:1: Warning:
+    Pattern match(es) are overlapped
+    In an equation for `f': f [] = ...
 
-werror.hs:10:1:
-    Warning: Pattern match(es) are non-exhaustive
-             In an equation for `f': Patterns not matched: _ : _
+werror.hs:10:1: Warning:
+    Pattern match(es) are non-exhaustive
+    In an equation for `f': Patterns not matched: _ : _
 
 <no location info>: 
 Failing due to -Werror.
diff --git a/testsuite/tests/ghci.debugger/scripts/break003.stderr b/testsuite/tests/ghci.debugger/scripts/break003.stderr
index 03dc88bfd8..fc7bb337d1 100644
--- a/testsuite/tests/ghci.debugger/scripts/break003.stderr
+++ b/testsuite/tests/ghci.debugger/scripts/break003.stderr
@@ -1,4 +1,4 @@
 
 <interactive>:5:1:
-    No instance for (Show (t -> a)) arising from a use of `print'
+    No instance for (Show (t -> t1)) arising from a use of `print'
     In a stmt of an interactive GHCi command: print it
diff --git a/testsuite/tests/ghci.debugger/scripts/break003.stdout b/testsuite/tests/ghci.debugger/scripts/break003.stdout
index ed418836c8..a48f74c4c3 100644
--- a/testsuite/tests/ghci.debugger/scripts/break003.stdout
+++ b/testsuite/tests/ghci.debugger/scripts/break003.stdout
@@ -1,6 +1,6 @@
 Breakpoint 0 activated at ../Test3.hs:2:18-31
 Stopped at ../Test3.hs:2:18-31
-_result :: [a] = _
-f :: t -> a = _
+_result :: [t1] = _
+f :: t -> t1 = _
 x :: t = _
 xs :: [t] = [_]
diff --git a/testsuite/tests/ghci.debugger/scripts/break005.stdout b/testsuite/tests/ghci.debugger/scripts/break005.stdout
index 82fc681105..65eeb56cf1 100644
--- a/testsuite/tests/ghci.debugger/scripts/break005.stdout
+++ b/testsuite/tests/ghci.debugger/scripts/break005.stdout
@@ -1,5 +1,5 @@
 Stopped at ../QSort.hs:(4,1)-(6,55)
-_result :: [a] = _
+_result :: [t] = _
 Stopped at ../QSort.hs:5:16-51
 _result :: [Integer] = _
 a :: Integer = 1
diff --git a/testsuite/tests/ghci.debugger/scripts/break006.stderr b/testsuite/tests/ghci.debugger/scripts/break006.stderr
index 45f6f83437..9543d675e2 100644
--- a/testsuite/tests/ghci.debugger/scripts/break006.stderr
+++ b/testsuite/tests/ghci.debugger/scripts/break006.stderr
@@ -1,9 +1,9 @@
 
 <interactive>:6:1:
-    No instance for (Show a) arising from a use of `print'
-    Cannot resolve unknown runtime type `a'
+    No instance for (Show t1) arising from a use of `print'
+    Cannot resolve unknown runtime type `t1'
     Use :print or :force to determine these types
-    Relevant bindings include it :: a (bound at <interactive>:6:1)
+    Relevant bindings include it :: t1 (bound at <interactive>:6:1)
     Note: there are several potential instances:
       instance Show Double -- Defined in `GHC.Float'
       instance Show Float -- Defined in `GHC.Float'
@@ -13,10 +13,10 @@
     In a stmt of an interactive GHCi command: print it
 
 <interactive>:8:1:
-    No instance for (Show a) arising from a use of `print'
-    Cannot resolve unknown runtime type `a'
+    No instance for (Show t1) arising from a use of `print'
+    Cannot resolve unknown runtime type `t1'
     Use :print or :force to determine these types
-    Relevant bindings include it :: a (bound at <interactive>:8:1)
+    Relevant bindings include it :: t1 (bound at <interactive>:8:1)
     Note: there are several potential instances:
       instance Show Double -- Defined in `GHC.Float'
       instance Show Float -- Defined in `GHC.Float'
diff --git a/testsuite/tests/ghci.debugger/scripts/break006.stdout b/testsuite/tests/ghci.debugger/scripts/break006.stdout
index b78f4f365b..7e5edbf9d2 100644
--- a/testsuite/tests/ghci.debugger/scripts/break006.stdout
+++ b/testsuite/tests/ghci.debugger/scripts/break006.stdout
@@ -1,15 +1,15 @@
 Stopped at ../Test3.hs:(1,1)-(2,31)
-_result :: [a] = _
+_result :: [t1] = _
 Stopped at ../Test3.hs:2:18-31
-_result :: [a] = _
-f :: Integer -> a = _
+_result :: [t1] = _
+f :: Integer -> t1 = _
 x :: Integer = 1
 xs :: [Integer] = [2,3]
 xs :: [Integer] = [2,3]
 x :: Integer = 1
-f :: Integer -> a = _
-_result :: [a] = _
-y = (_t1::a)
+f :: Integer -> t1 = _
+_result :: [t1] = _
+y = (_t1::t1)
 y = 2
 xs :: [Integer] = [2,3]
 x :: Integer = 1
diff --git a/testsuite/tests/ghci.debugger/scripts/break027.stdout b/testsuite/tests/ghci.debugger/scripts/break027.stdout
index fdacda8d85..bac674b946 100644
--- a/testsuite/tests/ghci.debugger/scripts/break027.stdout
+++ b/testsuite/tests/ghci.debugger/scripts/break027.stdout
@@ -1,6 +1,6 @@
 Breakpoint 0 activated at ../QSort.hs:(4,1)-(6,55)
 Stopped at ../QSort.hs:(4,1)-(6,55)
-_result :: [a] = _
+_result :: [t] = _
 Stopped at ../QSort.hs:5:16-51
 _result :: [Integer] = _
 a :: Integer = 3
diff --git a/testsuite/tests/ghci.debugger/scripts/hist001.stdout b/testsuite/tests/ghci.debugger/scripts/hist001.stdout
index 74cb483995..0b58b8fcb7 100644
--- a/testsuite/tests/ghci.debugger/scripts/hist001.stdout
+++ b/testsuite/tests/ghci.debugger/scripts/hist001.stdout
@@ -12,20 +12,20 @@ _result :: [a] = _
 -9  : mymap (../Test3.hs:(1,1)-(2,31))
 <end of history>
 Logged breakpoint at ../Test3.hs:(1,1)-(2,31)
-_result :: [a]
-_result :: [a] = _
+_result :: [t1]
+_result :: [t1] = _
 Logged breakpoint at ../Test3.hs:2:22-31
-_result :: [a]
-f :: t -> a
+_result :: [t1]
+f :: t -> t1
 xs :: [t]
 xs :: [t] = []
-f :: t -> a = _
-_result :: [a] = _
+f :: t -> t1 = _
+_result :: [t1] = _
 *** Ignoring breakpoint
 _result = []
 Logged breakpoint at ../Test3.hs:2:18-20
-_result :: a
-f :: Integer -> a
+_result :: t1
+f :: Integer -> t1
 x :: Integer
 Logged breakpoint at ../Test3.hs:2:22-31
-_result :: [a]
+_result :: [t1]
diff --git a/testsuite/tests/rename/should_fail/T5892a.stderr b/testsuite/tests/rename/should_fail/T5892a.stderr
index 9eecad61b9..1047599b83 100644
--- a/testsuite/tests/rename/should_fail/T5892a.stderr
+++ b/testsuite/tests/rename/should_fail/T5892a.stderr
@@ -1,10 +1,10 @@
-

-T5892a.hs:12:8: Warning:

-    Fields of `Version' not initialised: Data.Version.versionTags

-    In the expression: Version {..}

-    In the expression: let versionBranch = [] in Version {..}

-    In an equation for `foo':

-        foo (Version {..}) = let versionBranch = [] in Version {..}

-

-<no location info>: 

-Failing due to -Werror.

+
+T5892a.hs:12:8: Warning:
+    Fields of `Version' not initialised: Data.Version.versionTags
+    In the expression: Version {..}
+    In the expression: let versionBranch = [] in Version {..}
+    In an equation for `foo':
+        foo (Version {..}) = let versionBranch = ... in Version {..}
+
+<no location info>: 
+Failing due to -Werror.
diff --git a/testsuite/tests/th/TH_exn1.stderr b/testsuite/tests/th/TH_exn1.stderr
index f544485245..63548613d8 100644
--- a/testsuite/tests/th/TH_exn1.stderr
+++ b/testsuite/tests/th/TH_exn1.stderr
@@ -3,4 +3,4 @@ TH_exn1.hs:1:1:
     Exception when trying to run compile-time code:
       TH_exn1.hs:(9,4)-(10,23): Non-exhaustive patterns in case
 
-      Code: case reverse "no" of { [] -> return (GHC.Types.[]) }
+    Code: case reverse "no" of { [] -> return [] }
diff --git a/testsuite/tests/typecheck/should_fail/T2534.stderr b/testsuite/tests/typecheck/should_fail/T2534.stderr
index 8943b979ac..02ad7821ff 100644
--- a/testsuite/tests/typecheck/should_fail/T2534.stderr
+++ b/testsuite/tests/typecheck/should_fail/T2534.stderr
@@ -1,6 +1,6 @@
 
 T2534.hs:3:19:
-    Couldn't match expected type `a -> a -> b' with actual type `[a0]'
+    Couldn't match expected type `a -> a -> b' with actual type `[t0]'
     Relevant bindings include
       foo :: a -> a -> b (bound at T2534.hs:3:1)
     In the second argument of `foldr', namely `[]'
diff --git a/testsuite/tests/typecheck/should_fail/T5858.stderr b/testsuite/tests/typecheck/should_fail/T5858.stderr
index 0ecd766ec6..437b5baca6 100644
--- a/testsuite/tests/typecheck/should_fail/T5858.stderr
+++ b/testsuite/tests/typecheck/should_fail/T5858.stderr
@@ -1,10 +1,10 @@
-

-T5858.hs:11:7:

-    No instance for (InferOverloaded ([a0], [a1]))

-      arising from a use of `infer'

-    The type variables `a0', `a1' are ambiguous

-    Note: there is a potential instance available:

-      instance t1 ~ String => InferOverloaded (t1, t1)

-        -- Defined at T5858.hs:8:10

-    In the expression: infer ([], [])

-    In an equation for `foo': foo = infer ([], [])

+
+T5858.hs:11:7:
+    No instance for (InferOverloaded ([t0], [t1]))
+      arising from a use of `infer'
+    The type variables `t0', `t1' are ambiguous
+    Note: there is a potential instance available:
+      instance t1 ~ String => InferOverloaded (t1, t1)
+        -- Defined at T5858.hs:8:10
+    In the expression: infer ([], [])
+    In an equation for `foo': foo = infer ([], [])
diff --git a/testsuite/tests/typecheck/should_fail/tcfail001.stderr b/testsuite/tests/typecheck/should_fail/tcfail001.stderr
index 85b6788a7f..8734ee32b4 100644
--- a/testsuite/tests/typecheck/should_fail/tcfail001.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail001.stderr
@@ -1,6 +1,6 @@
 
 tcfail001.hs:9:2:
-    Couldn't match expected type `[t0] -> [a0]' with actual type `[a]'
+    Couldn't match expected type `[t0] -> [t1]' with actual type `[a]'
     Relevant bindings include op :: [a] (bound at tcfail001.hs:9:2)
     The equation(s) for `op' have one argument,
     but its type `[a]' has none
diff --git a/testsuite/tests/typecheck/should_fail/tcfail012.stderr b/testsuite/tests/typecheck/should_fail/tcfail012.stderr
index 7fe9b18d47..7d99a18a3c 100644
--- a/testsuite/tests/typecheck/should_fail/tcfail012.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail012.stderr
@@ -1,5 +1,5 @@
 
 tcfail012.hs:3:8:
-    Couldn't match expected type `Bool' with actual type `[a0]'
+    Couldn't match expected type `Bool' with actual type `[t0]'
     In the expression: []
     In a pattern binding: True = []