diff --git a/ghc/tests/rename/should_compile/Int10.hi b/ghc/tests/rename/should_compile/Int10.hi
index 335754f54c5aa580a2480d9e20e13eb8e67017bf..44c3bf3934bb1373c9363ca20d87b5c3b69d029c 100644
--- a/ghc/tests/rename/should_compile/Int10.hi
+++ b/ghc/tests/rename/should_compile/Int10.hi
@@ -1,7 +1,5 @@
-_interface_ Int10 1 400
-_exports_
-Int10 T1{C1} T2{T2C1 T2C2} T3{T3C1 T3C2 T3C3} T4{T4C1 T4C2 T4C3 T4C4} T5{T5C1 T5C2 T5C3 T5C4 T5C5} T6{T6C6} T7{T7C6 T7C7} ;
-_declarations_
+__interface Int10 1 0 where
+__export Int10 T1{C1} T2{T2C1 T2C2} T3{T3C1 T3C2 T3C3} T4{T4C1 T4C2 T4C3 T4C4} T5{T5C1 T5C2 T5C3 T5C4 T5C5} T6{T6C6} T7{T7C6 T7C7} ;
1 data T1 a = C1 a;
1 data T2 a b = T2C1 a | T2C2 b ;
1 data T3 a b c = T3C1 a | T3C2 b | T3C3 c ;
diff --git a/ghc/tests/rename/should_compile/Makefile b/ghc/tests/rename/should_compile/Makefile
index 2596f4de68142defab802e7ac9a5bded47b55817..fd954bb2abbe493a0db91e6330ad9df7b793bf1e 100644
--- a/ghc/tests/rename/should_compile/Makefile
+++ b/ghc/tests/rename/should_compile/Makefile
@@ -4,7 +4,7 @@ include $(TOP)/mk/should_compile.mk
SRC_HC_OPTS += -noC -dcore-lint
-rn017_HC_OPTS = -hi
+rn017_HC_OPTS = -hi -hi-with-exports
include $(TOP)/mk/target.mk
diff --git a/ghc/tests/rename/should_compile/Rn016.hi b/ghc/tests/rename/should_compile/Rn016.hi
index fdf2ca04def0b431a5754ecbe93e6f3ce909a917..30dca25bc83446fa1188a11de99c375cae8be6c9 100644
--- a/ghc/tests/rename/should_compile/Rn016.hi
+++ b/ghc/tests/rename/should_compile/Rn016.hi
@@ -1,12 +1,9 @@
-_interface_ Rn016 1 400
-_exports_
-Rn016 K{op1 op2};
-_instances_
-instance {K PrelBase.Int} = $d1;
-instance {K PrelBase.Bool} = $d2;
-instance _forall_ [a] => {K [a]} = $d3;
-_declarations_
-1 $d1 _:_ {K PrelBase.Int} ;;
-1 $d2 _:_ {K PrelBase.Bool} ;;
-1 $d3 _:_ _forall_ [a] {K PrelList.[a]} ;;
+__interface Rn016 1 0 where
+__export Rn016 K{op1 op2};
+instance {K PrelBase.Int} = _f1;
+instance {K PrelBase.Bool} = _f2;
+instance __forall [a] => {K [a]} = _f3;
+1 _f1 :: {K PrelBase.Int} ;
+1 _f2 :: {K PrelBase.Bool} ;
+1 _f3 :: __forall [a] => {K PrelList.[a]} ;
1 class K a :: (* -> *) where { op1 :: a -> a ; op2 :: a -> a } ;
diff --git a/ghc/tests/rename/should_compile/Rn017.hi b/ghc/tests/rename/should_compile/Rn017.hi
index b61877491a149963810e1356fc467df0b7a719c9..8f85dbb53792e7e3e9e5049231000167dec1f375 100644
--- a/ghc/tests/rename/should_compile/Rn017.hi
+++ b/ghc/tests/rename/should_compile/Rn017.hi
@@ -1,9 +1,7 @@
-_interface_ Rn017 1 400
-_exports_
-Rn017 a b c Wibble{MkWibble} Wobble ;
-_declarations_
+__interface Rn017 1 0 where
+__export Rn017 a b c Wibble{MkWibble} Wobble ;
1 data Wibble = MkWibble Wobble ;
1 data Wobble ;
-1 a _:_ Int -> Int ;;
-1 b _:_ Int -> Int ;;
-1 c _:_ Int -> Int ;;
+1 a :: Int -> Int ;
+1 b :: Int -> Int ;
+1 c :: Int -> Int ;
diff --git a/ghc/tests/rename/should_compile/rn003.hs b/ghc/tests/rename/should_compile/rn003.hs
index 493cfa27799f998b0a848ca12f97025647569e73..bb225837211090f53f648a5ebce0e82f372902dc 100644
--- a/ghc/tests/rename/should_compile/rn003.hs
+++ b/ghc/tests/rename/should_compile/rn003.hs
@@ -2,7 +2,7 @@ module Foo (f) where
-- export food
f x = x
---!!! weird patterns with no variables
+-- !!! weird patterns with no variables
1 = f 1
[] = f []
1 = f (f 1)
diff --git a/ghc/tests/rename/should_compile/rn005.hs b/ghc/tests/rename/should_compile/rn005.hs
index f1df4244af461e077354ab38994e78fd3bca708d..623bd78df35b9aaf3d622439a66586c354f21b30 100644
--- a/ghc/tests/rename/should_compile/rn005.hs
+++ b/ghc/tests/rename/should_compile/rn005.hs
@@ -1,4 +1,4 @@
---!!! rn005: simplest case: a few non-recursive bindings
+-- !!! rn005: simplest case: a few non-recursive bindings
module Test where
diff --git a/ghc/tests/rename/should_compile/rn006.hs b/ghc/tests/rename/should_compile/rn006.hs
index 6524bbabea30e9190e25e326194e0483f9c312d3..4f4c0a4fed5eca4c073b83b6426eaf69af4ccac2 100644
--- a/ghc/tests/rename/should_compile/rn006.hs
+++ b/ghc/tests/rename/should_compile/rn006.hs
@@ -1,6 +1,6 @@
---!!! rn006: two sets of mutually-recursive blobs:
---!!! f, g, h are mut rec
---!!! i, j, k are mut rec
+-- !!! rn006: two sets of mutually-recursive blobs:
+-- !!! f, g, h are mut rec
+-- !!! i, j, k are mut rec
module Test where
diff --git a/ghc/tests/rename/should_compile/rn006.stderr b/ghc/tests/rename/should_compile/rn006.stderr
index 955d1e1e9fe9a44c1af66933722020aa1919e389..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644
--- a/ghc/tests/rename/should_compile/rn006.stderr
+++ b/ghc/tests/rename/should_compile/rn006.stderr
@@ -1,2 +0,0 @@
-
-NOTE: Simplifier still going after 4 iterations; bailing out.
diff --git a/ghc/tests/rename/should_compile/rn016.hs b/ghc/tests/rename/should_compile/rn016.hs
index a1c129093634f00fdd1d027abe249b2479cde676..618880eae3c9c5e646aca5e9611a28b681d8416c 100644
--- a/ghc/tests/rename/should_compile/rn016.hs
+++ b/ghc/tests/rename/should_compile/rn016.hs
@@ -1,4 +1,4 @@
---!!! Import an interface defining a class and some instances
+-- !!! Import an interface defining a class and some instances
module Main where
diff --git a/ghc/tests/rename/should_compile/rn017.hs b/ghc/tests/rename/should_compile/rn017.hs
index 1a3c2d0569b25560642434ecb75a9405bac4c449..6694f248aacd82f785d616cb7c874f3780f19db6 100644
--- a/ghc/tests/rename/should_compile/rn017.hs
+++ b/ghc/tests/rename/should_compile/rn017.hs
@@ -1,4 +1,4 @@
---!! Rexporting
+-- !! Rexporting
module Test ( module Test , module Rn017 ) where
import Rn017
diff --git a/ghc/tests/rename/should_compile/rn017.stderr b/ghc/tests/rename/should_compile/rn017.stderr
index 6a7ad6952aa13410f1647e95e8906b02528d5c65..97e1a59809b46b7cb86ad2daa5cf9612eb06b35c 100644
--- a/ghc/tests/rename/should_compile/rn017.stderr
+++ b/ghc/tests/rename/should_compile/rn017.stderr
@@ -1,20 +1,3 @@
ghc: module version changed to 1; reason: no old .hi file
-_interface_ Test 1 400
-_instance_modules_
-IO PrelAddr PrelArr PrelBounded PrelCCall PrelForeign PrelIOBase PrelNum PrelNumExtra PrelTup
-_usages_
-PrelBase 1 :: $dEq0 1 $dEq1 1 $dEqBool0 1 $dEqChar0 1 $dEqInt0 1 $dEqInteger0 1 $dNumInt0 1 $dShow0 1 $dShow1 1 $dShow2 1 $dShowBool0 1 $dShowChar0 1 $dShowInt0 1 $m- 1 $m/= 1 $mfromInt 1 $mshowList 1 addr2Integer 1 foldr 1 int2Integer 1 integer_0 1 integer_1 1 integer_2 1 integer_m1 1 Eq 1 Num 1 Show 1 String 1;
-PrelNum 1 :: $dNumInteger0 1 $dShowInteger0 1;
-PrelNumExtra 1 :: $dEqDouble0 1 $dNumDouble0 1 $dShowDouble0 1;
-PrelPack 1 :: packCString# 1 unpackAppendCString# 1 unpackCString# 1 unpackFoldrCString# 1 unpackNBytes# 1;
-Rn017 1 ::;
-_exports_
-Rn017 a b c Wibble{MkWibble} Wobble;
-Test f FOO{:FOO :FOO op} Foo{MkFoo};
-_instances_
-instance {FOO Foo} = $dFOOFoo0;
-_declarations_
-1 $dFOOFoo0 _:_ {FOO Foo} ;;
-1 class FOO $r3I where {op :: $r3I -> PrelBase.Int} ;
-1 data Foo = MkFoo ;
-1 f _:_ _forall_ [$a] => $a -> $a ;;
+__export Rn017 a b c Wibble{MkWibble} Wobble;
+__export Test f FOO{op} Foo{MkFoo};
diff --git a/ghc/tests/rename/should_compile/rn023.hs b/ghc/tests/rename/should_compile/rn023.hs
index 4b533ecacb216e19b71877bc121cfb5b40d0254f..3522ff0ff49f0ef82358e7bb2c2f783c77fc3d26 100644
--- a/ghc/tests/rename/should_compile/rn023.hs
+++ b/ghc/tests/rename/should_compile/rn023.hs
@@ -1,3 +1,3 @@
---!! This one is fine in Haskell 1.4
+-- !! This one is fine in Haskell 1.4
--
module Foo ( Bar(..) ) where { data Bar = Bar X; data X = Y }
diff --git a/ghc/tests/rename/should_compile/rn024.hs b/ghc/tests/rename/should_compile/rn024.hs
index 36fd8fdffe56f54cfd35a1f5f750d74c8905abe3..ae9cc6b4f03d7aacd02624dd55f98db862a480bf 100644
--- a/ghc/tests/rename/should_compile/rn024.hs
+++ b/ghc/tests/rename/should_compile/rn024.hs
@@ -1,4 +1,4 @@
---!! This is fine in Haskell 1.4
+-- !! This is fine in Haskell 1.4
--
module Foo ( Baz(..) ) where
diff --git a/ghc/tests/rename/should_compile/timing001.hs b/ghc/tests/rename/should_compile/timing001.hs
index ab201020dd7bd81d59e87b653de12d839162e7e0..b84b341f199aa69a4c79f1663dd7d00b38bfa194 100644
--- a/ghc/tests/rename/should_compile/timing001.hs
+++ b/ghc/tests/rename/should_compile/timing001.hs
@@ -1,4 +1,4 @@
---!!! 500 defns chained together at the top-level
+-- !!! 500 defns chained together at the top-level
module Main(main) where
main = undefined
a000 = a001
diff --git a/ghc/tests/rename/should_compile/timing002.hs b/ghc/tests/rename/should_compile/timing002.hs
index db98718e4bd1790a38df50915b29ad2c01f75dd2..f81b026a6781a3f1c3fc0ca75aa9a41d334c4910 100644
--- a/ghc/tests/rename/should_compile/timing002.hs
+++ b/ghc/tests/rename/should_compile/timing002.hs
@@ -1,4 +1,4 @@
---!!! 500 defns chained together with "where"s
+-- !!! 500 defns chained together with "where"s
module Main(main) where
main = undefined
diff --git a/ghc/tests/rename/should_compile/timing003.hs b/ghc/tests/rename/should_compile/timing003.hs
index e897868c1d1ee5618117e853764664a99cc36ddf..c268646daf9ae88f9b6a980b3dbabe41f3328f9d 100644
--- a/ghc/tests/rename/should_compile/timing003.hs
+++ b/ghc/tests/rename/should_compile/timing003.hs
@@ -1,4 +1,4 @@
---!!! 500 defns, not chained together
+-- !!! 500 defns, not chained together
module Main(main) where
main = undefined
diff --git a/ghc/tests/rename/should_fail/rnfail001.stderr b/ghc/tests/rename/should_fail/rnfail001.stderr
index 92fd2289d120817b6fda554906641eef7964a7b7..aa56cac854f768b904f07e7bfb0aaac750f627ac 100644
--- a/ghc/tests/rename/should_fail/rnfail001.stderr
+++ b/ghc/tests/rename/should_fail/rnfail001.stderr
@@ -3,3 +3,4 @@ rnfail001.hs:3: Conflicting definitions for `x' in pattern
Compilation had errors
+
diff --git a/ghc/tests/rename/should_fail/rnfail002.hs b/ghc/tests/rename/should_fail/rnfail002.hs
index f2648a9b995856d925407d983e4e52baa583ad2d..ab387223fcc69da52d4d9e00a0d09cfcd45470f1 100644
--- a/ghc/tests/rename/should_fail/rnfail002.hs
+++ b/ghc/tests/rename/should_fail/rnfail002.hs
@@ -1,5 +1,5 @@
---!!! rn001: super-simple set of bindings,
---!!! incl wildcard pattern-bindings and *duplicates*
+-- !!! rn001: super-simple set of bindings,
+-- !!! incl wildcard pattern-bindings and *duplicates*
x = []
y = []
diff --git a/ghc/tests/rename/should_fail/rnfail002.stderr b/ghc/tests/rename/should_fail/rnfail002.stderr
index 24a860182b543b9f058a5a7c4fec0791712a3857..4a0a131b567383c415891568db62df62abeeac74 100644
--- a/ghc/tests/rename/should_fail/rnfail002.stderr
+++ b/ghc/tests/rename/should_fail/rnfail002.stderr
@@ -1,8 +1,9 @@
rnfail002.hs:4:
- Conflicting definitions for `y'
- Defined at rnfail002.hs:6
- Defined at rnfail002.hs:5
+ Multiple declarations of `y'
+ defined at rnfail002.hs:5
+ defined at rnfail002.hs:6
Compilation had errors
+
diff --git a/ghc/tests/rename/should_fail/rnfail003.hs b/ghc/tests/rename/should_fail/rnfail003.hs
index 51a09b65c2ba86bce38630edfabca7174ae35aa6..fb62bac0744bc766ca2bcd5ccef048ccf21e84b6 100644
--- a/ghc/tests/rename/should_fail/rnfail003.hs
+++ b/ghc/tests/rename/should_fail/rnfail003.hs
@@ -1,4 +1,4 @@
---!!! split definition of f (error)
+-- !!! split definition of f (error)
f [] = []
g x = x
f (x:xs) = []
diff --git a/ghc/tests/rename/should_fail/rnfail003.stderr b/ghc/tests/rename/should_fail/rnfail003.stderr
index 25b82c0112b57ac9f6cd91a2a122ae3a676009a6..cd3ec692c15ac3cdf446f57de058e9478afdd35d 100644
--- a/ghc/tests/rename/should_fail/rnfail003.stderr
+++ b/ghc/tests/rename/should_fail/rnfail003.stderr
@@ -1,8 +1,9 @@
rnfail003.hs:2:
- Conflicting definitions for `f'
- Defined at rnfail003.hs:4
- Defined at rnfail003.hs:2
+ Multiple declarations of `f'
+ defined at rnfail003.hs:2
+ defined at rnfail003.hs:4
Compilation had errors
+
diff --git a/ghc/tests/rename/should_fail/rnfail004.hs b/ghc/tests/rename/should_fail/rnfail004.hs
index 3a14f48f812950e2ec241df4a82254f8f7b489b3..90a97f894cf22aa33e061530e0c3ae9c78d32cc4 100644
--- a/ghc/tests/rename/should_fail/rnfail004.hs
+++ b/ghc/tests/rename/should_fail/rnfail004.hs
@@ -1,4 +1,4 @@
---!!! multiple definitions, but hidden in patterns
+-- !!! multiple definitions, but hidden in patterns
module Foo where
f x = x
diff --git a/ghc/tests/rename/should_fail/rnfail004.stderr b/ghc/tests/rename/should_fail/rnfail004.stderr
index cd56751d50dbb93b175ce01c6ee3ff4c95b0c263..1136eea73527b877b51489c3180ca60ac8622273 100644
--- a/ghc/tests/rename/should_fail/rnfail004.stderr
+++ b/ghc/tests/rename/should_fail/rnfail004.stderr
@@ -5,3 +5,4 @@ rnfail004.hs:7: Conflicting definitions for `b' in binding group
Compilation had errors
+
diff --git a/ghc/tests/rename/should_fail/rnfail007.hs b/ghc/tests/rename/should_fail/rnfail007.hs
index 99254dcf44b7048843d7e8ffe85ac52fdef5dc0b..272abcf9fbf9a21bfe4d6207cf3bad64d0bbf787 100644
--- a/ghc/tests/rename/should_fail/rnfail007.hs
+++ b/ghc/tests/rename/should_fail/rnfail007.hs
@@ -1,4 +1,4 @@
---!!! Main module with no definition of main
+-- !!! Main module with no definition of main
module Main where
diff --git a/ghc/tests/rename/should_fail/rnfail007.stderr b/ghc/tests/rename/should_fail/rnfail007.stderr
index 56ef0455de1e471088666f0946c551901130dbad..7e8bc0e878f38b33d6200e27008f92424ac9d002 100644
--- a/ghc/tests/rename/should_fail/rnfail007.stderr
+++ b/ghc/tests/rename/should_fail/rnfail007.stderr
@@ -4,3 +4,4 @@ rnfail007.hs:3:
Compilation had errors
+
diff --git a/ghc/tests/rename/should_fail/rnfail008.hs b/ghc/tests/rename/should_fail/rnfail008.hs
index 852034734efb3ac2ce4c609652d58db03ee6c664..196214a840144fcdd5a78919d5d5a8d3065e02ab 100644
--- a/ghc/tests/rename/should_fail/rnfail008.hs
+++ b/ghc/tests/rename/should_fail/rnfail008.hs
@@ -1,4 +1,4 @@
---!!! Class and instance decl
+-- !!! Class and instance decl
module Test where
diff --git a/ghc/tests/rename/should_fail/rnfail008.stderr b/ghc/tests/rename/should_fail/rnfail008.stderr
index 5c51c894f4304629bfdabbed923eaeb5c2f6a70d..be1cc77d8d9cff4f6e054f90983a0ff65b54de68 100644
--- a/ghc/tests/rename/should_fail/rnfail008.stderr
+++ b/ghc/tests/rename/should_fail/rnfail008.stderr
@@ -3,3 +3,4 @@ rnfail008.hs:18: Value not in scope: `op3'
Compilation had errors
+
diff --git a/ghc/tests/rename/should_fail/rnfail009.stderr b/ghc/tests/rename/should_fail/rnfail009.stderr
index 0decea24835ba449bfe84da13cca5a3d6b68879e..774e538bd2d47c96a6b1f0c628862d9495138110 100644
--- a/ghc/tests/rename/should_fail/rnfail009.stderr
+++ b/ghc/tests/rename/should_fail/rnfail009.stderr
@@ -1,8 +1,9 @@
rnfail009.hs:1:
- Conflicting definitions for `A'
- Defined at rnfail009.hs:5
- Defined at rnfail009.hs:3
+ Multiple declarations of `A'
+ defined at rnfail009.hs:3
+ defined at rnfail009.hs:5
Compilation had errors
+
diff --git a/ghc/tests/rename/should_fail/rnfail010.stderr b/ghc/tests/rename/should_fail/rnfail010.stderr
index 9c4cf0274330aa9a7923c0b47638c5f2972ddae7..d19435ba49db74f251af5c03b815d5ad473aa84c 100644
--- a/ghc/tests/rename/should_fail/rnfail010.stderr
+++ b/ghc/tests/rename/should_fail/rnfail010.stderr
@@ -1,8 +1,9 @@
rnfail010.hs:2:
- Conflicting definitions for `f'
- Defined at rnfail010.hs:6
- Defined at rnfail010.hs:2
+ Multiple declarations of `f'
+ defined at rnfail010.hs:2
+ defined at rnfail010.hs:6
Compilation had errors
+
diff --git a/ghc/tests/rename/should_fail/rnfail011.stderr b/ghc/tests/rename/should_fail/rnfail011.stderr
index 1b4602f3b086ee06ca238869d6ab4e227e9d022f..8a33a317625e39a8d4e2651bd002853ba761fa87 100644
--- a/ghc/tests/rename/should_fail/rnfail011.stderr
+++ b/ghc/tests/rename/should_fail/rnfail011.stderr
@@ -1,8 +1,9 @@
rnfail011.hs:2:
- Conflicting definitions for `A'
- Defined at rnfail011.hs:6
- Defined at rnfail011.hs:2
+ Multiple declarations of `A'
+ defined at rnfail011.hs:2
+ defined at rnfail011.hs:6
Compilation had errors
+
diff --git a/ghc/tests/rename/should_fail/rnfail012.stderr b/ghc/tests/rename/should_fail/rnfail012.stderr
index d1afdd71cc1d4a9bfd4bf5887f842a979168749e..bee8e16698a92e05f7d4b654486cd3c7a9e76a37 100644
--- a/ghc/tests/rename/should_fail/rnfail012.stderr
+++ b/ghc/tests/rename/should_fail/rnfail012.stderr
@@ -1,13 +1,9 @@
rnfail012.hs:2:
- Conflicting definitions for `A'
- Defined at rnfail012.hs:9
- Defined at rnfail012.hs:3
-
-rnfail012.hs:2:
- Conflicting definitions for `:A'
- Defined at rnfail012.hs:9
- Defined at rnfail012.hs:3
+ Multiple declarations of `A'
+ defined at rnfail012.hs:3
+ defined at rnfail012.hs:9
Compilation had errors
+
diff --git a/ghc/tests/rename/should_fail/rnfail013.hs b/ghc/tests/rename/should_fail/rnfail013.hs
index 0c78946c179ce056726d4cc5e18cdac416711ba0..4d30ded1857c196d39b893ca2133dc75a1923af9 100644
--- a/ghc/tests/rename/should_fail/rnfail013.hs
+++ b/ghc/tests/rename/should_fail/rnfail013.hs
@@ -1,4 +1,4 @@
---!!! Conflicting constructors from two data type decls
+-- !!! Conflicting constructors from two data type decls
module Foo where
diff --git a/ghc/tests/rename/should_fail/rnfail013.stderr b/ghc/tests/rename/should_fail/rnfail013.stderr
index 253eb6eff142e7e88a540690cf7f70fb7125d8c0..86c73ba6912eec8029b6c14a91b7f6442e877cd3 100644
--- a/ghc/tests/rename/should_fail/rnfail013.stderr
+++ b/ghc/tests/rename/should_fail/rnfail013.stderr
@@ -1,8 +1,9 @@
rnfail013.hs:3:
- Conflicting definitions for `MkT'
- Defined at rnfail013.hs:9
- Defined at rnfail013.hs:7
+ Multiple declarations of `MkT'
+ defined at rnfail013.hs:7
+ defined at rnfail013.hs:9
Compilation had errors
+
diff --git a/ghc/tests/rename/should_fail/rnfail014.stderr b/ghc/tests/rename/should_fail/rnfail014.stderr
index 8e2bef9ef364816e66dcc68df1d48980ea98daf8..460650ac3d81995344f8bddc89b22ddadbb0b043 100644
--- a/ghc/tests/rename/should_fail/rnfail014.stderr
+++ b/ghc/tests/rename/should_fail/rnfail014.stderr
@@ -1,4 +1,16 @@
+rnfail014.hs:9:
+ The constraint `Eq a' does not mention any of
+ the universally quantified type variables {}
+ of the type `Eq Bool'
+ In the type signature for an instance decl
+
+rnfail014.hs:9:
+ The constraint `Eq a'
+ mentions type variables that do not appear in the type
+ `Eq Bool'
+ In the type signature for an instance decl
+
rnfail014.hs:12:
The constraint `Eq a' does not mention any of
the universally quantified type variables {}
@@ -16,18 +28,7 @@ rnfail014.hs:17:
the universally quantified type variables {}
of the type `a -> a'
In the type signature for `op'
-
-rnfail014.hs:9:
- The constraint `Eq a' does not mention any of
- the universally quantified type variables {}
- of the type `Eq Bool'
- In the type signature for an instance decl
-
-rnfail014.hs:9:
- The constraint `Eq a'
- mentions type variables that do not appear in the type
- `Eq Bool'
- In the type signature for an instance decl
Compilation had errors
+
diff --git a/ghc/tests/rename/should_fail/rnfail015.hs b/ghc/tests/rename/should_fail/rnfail015.hs
index 0852c5035326650c48ec9d8d2d5a180a7e81c670..20f9934f4b3829957147e0a91ed3e95aa7614c62 100644
--- a/ghc/tests/rename/should_fail/rnfail015.hs
+++ b/ghc/tests/rename/should_fail/rnfail015.hs
@@ -1,6 +1,6 @@
module ShouldFail where
---!!! duplicate constructors in datatype
+-- !!! duplicate constructors in datatype
-- (bug report from Alex Ferguson, c. 2.06)
data Token
diff --git a/ghc/tests/rename/should_fail/rnfail015.stderr b/ghc/tests/rename/should_fail/rnfail015.stderr
index a4add481153c2eaac8dfe33295dab6a0edb8871c..5dfde4c71a6e7849bb5ec186ffbe3061f3105716 100644
--- a/ghc/tests/rename/should_fail/rnfail015.stderr
+++ b/ghc/tests/rename/should_fail/rnfail015.stderr
@@ -4,3 +4,4 @@ rnfail015.hs:9:
Compilation had errors
+