Follow the move of Word from base to ghc-prim

15 files changed, 54 insertions, 45 deletions

diff --git a/testsuite/tests/annotations/should_fail/annfail10.stderr b/testsuite/tests/annotations/should_fail/annfail10.stderr
index 8b2e59375b..3813d719c2 100644
--- a/testsuite/tests/annotations/should_fail/annfail10.stderr
+++ b/testsuite/tests/annotations/should_fail/annfail10.stderr
@@ -22,7 +22,8 @@ annfail10.hs:9:11:
     Note: there are several potential instances:
       instance Num Double -- Defined in `GHC.Float'
       instance Num Float -- Defined in `GHC.Float'
-      instance Num Int -- Defined in `GHC.Num'
+      instance Integral a => Num (GHC.Real.Ratio a)
+        -- Defined in `GHC.Real'
       ...plus 11 others
     In the expression: 1
     In the annotation: {-# ANN f 1 #-}
diff --git a/testsuite/tests/ghci.debugger/scripts/break006.stderr b/testsuite/tests/ghci.debugger/scripts/break006.stderr
index 6ebe46bb85..dfe51addd4 100644
--- a/testsuite/tests/ghci.debugger/scripts/break006.stderr
+++ b/testsuite/tests/ghci.debugger/scripts/break006.stderr
@@ -6,8 +6,9 @@
     Note: there are several potential instances:
       instance Show Double -- Defined in `GHC.Float'
       instance Show Float -- Defined in `GHC.Float'
-      instance Show () -- Defined in `GHC.Show'
-      ...plus 24 others
+      instance (Integral a, Show a) => Show (GHC.Real.Ratio a)
+        -- Defined in `GHC.Real'
+      ...plus 26 others
     In a stmt of an interactive GHCi command: print it
 
 <interactive>:8:1:
@@ -17,6 +18,7 @@
     Note: there are several potential instances:
       instance Show Double -- Defined in `GHC.Float'
       instance Show Float -- Defined in `GHC.Float'
-      instance Show () -- Defined in `GHC.Show'
-      ...plus 24 others
+      instance (Integral a, Show a) => Show (GHC.Real.Ratio a)
+        -- Defined in `GHC.Real'
+      ...plus 26 others
     In a stmt of an interactive GHCi command: print it
diff --git a/testsuite/tests/ghci.debugger/scripts/print019.stderr b/testsuite/tests/ghci.debugger/scripts/print019.stderr
index 091cf6602d..7b7b1309ad 100644
--- a/testsuite/tests/ghci.debugger/scripts/print019.stderr
+++ b/testsuite/tests/ghci.debugger/scripts/print019.stderr
@@ -7,5 +7,5 @@
       instance Show a => Show (List1 a) -- Defined at ../Test.hs:11:12
       instance Show MyInt -- Defined at ../Test.hs:14:16
       instance Show a => Show (MkT a) -- Defined at ../Test.hs:17:13
-      ...plus 32 others
+      ...plus 34 others
     In a stmt of an interactive GHCi command: print it
diff --git a/testsuite/tests/ghci/scripts/Defer02.stderr b/testsuite/tests/ghci/scripts/Defer02.stderr
index 227594c4c3..189b4b7f93 100644
--- a/testsuite/tests/ghci/scripts/Defer02.stderr
+++ b/testsuite/tests/ghci/scripts/Defer02.stderr
@@ -58,8 +58,9 @@
     Note: there are several potential instances:
       instance Num Double -- Defined in `GHC.Float'
       instance Num Float -- Defined in `GHC.Float'
-      instance Num Int -- Defined in `GHC.Num'
-      ...plus one other
+      instance Integral a => Num (GHC.Real.Ratio a)
+        -- Defined in `GHC.Real'
+      ...plus three others
     In the first argument of `myOp', namely `23'
     In the expression: myOp 23
     In an equation for `j': j = myOp 23
diff --git a/testsuite/tests/rename/should_compile/T3103/GHC/Word.hs b/testsuite/tests/rename/should_compile/T3103/GHC/Word.hs
index 81f438af8b..6866e92879 100644
--- a/testsuite/tests/rename/should_compile/T3103/GHC/Word.hs
+++ b/testsuite/tests/rename/should_compile/T3103/GHC/Word.hs
@@ -5,11 +5,10 @@ module GHC.Word (
     ) where
 
 import GHC.Base
+import GHC.Types
 
 import {-# SOURCE #-} GHC.Unicode ()
 
-data Word = W# Word# deriving Eq
-
 instance Num Word where
     signum 0               = 0
     signum _               = 1
diff --git a/testsuite/tests/rename/should_compile/T3103/T3103.stderr b/testsuite/tests/rename/should_compile/T3103/T3103.stderr
index 4f9d84dc38..a36e4484b6 100644
--- a/testsuite/tests/rename/should_compile/T3103/T3103.stderr
+++ b/testsuite/tests/rename/should_compile/T3103/T3103.stderr
@@ -1,3 +1,3 @@
 
-GHC/Word.hs:9:23:
+GHC/Word.hs:10:23:
     Warning: {-# SOURCE #-} unnecessary in import of  `GHC.Unicode'
diff --git a/testsuite/tests/th/TH_repPrim.stderr b/testsuite/tests/th/TH_repPrim.stderr
index 64df06518c..33317c6205 100644
--- a/testsuite/tests/th/TH_repPrim.stderr
+++ b/testsuite/tests/th/TH_repPrim.stderr
@@ -1,7 +1,7 @@
 AppE (ConE GHC.Types.I#) (LitE (IntPrimL 20))
 GHC.Types.I# 20#
-AppE (ConE GHC.Word.W#) (LitE (WordPrimL 32))
-GHC.Word.W# 32##
+AppE (ConE GHC.Types.W#) (LitE (WordPrimL 32))
+GHC.Types.W# 32##
 AppE (ConE GHC.Types.F#) (LitE (FloatPrimL (123 % 10)))
 GHC.Types.F# 12.3#
 AppE (ConE GHC.Types.D#) (LitE (DoublePrimL (123 % 5)))
diff --git a/testsuite/tests/typecheck/should_fail/T5095.stderr b/testsuite/tests/typecheck/should_fail/T5095.stderr
index af50aeae08..1cfcfea306 100644
--- a/testsuite/tests/typecheck/should_fail/T5095.stderr
+++ b/testsuite/tests/typecheck/should_fail/T5095.stderr
@@ -1,9 +1,9 @@
 
 T5095.hs:9:11:
-    Overlapping instances for Eq a
-      arising from a use of `=='
+    Overlapping instances for Eq a arising from a use of `=='
     Matching instances:
       instance [overlap ok] Show a => Eq a -- Defined at T5095.hs:5:10
+      instance Eq a => Eq (GHC.Real.Ratio a) -- Defined in `GHC.Real'
       instance Eq () -- Defined in `GHC.Classes'
       instance (Eq a, Eq b) => Eq (a, b) -- Defined in `GHC.Classes'
       instance (Eq a, Eq b, Eq c) => Eq (a, b, c)
@@ -57,6 +57,7 @@ T5095.hs:9:11:
       instance Eq Float -- Defined in `GHC.Classes'
       instance Eq Int -- Defined in `GHC.Classes'
       instance Eq Ordering -- Defined in `GHC.Classes'
+      instance Eq GHC.Types.Word -- Defined in `GHC.Classes'
       instance Eq a => Eq [a] -- Defined in `GHC.Classes'
       instance Eq Integer -- Defined in `integer-gmp:GHC.Integer.Type'
     (The choice depends on the instantiation of `a'
diff --git a/testsuite/tests/typecheck/should_fail/mc23.stderr b/testsuite/tests/typecheck/should_fail/mc23.stderr
index b3bad44e47..980d55c78a 100644
--- a/testsuite/tests/typecheck/should_fail/mc23.stderr
+++ b/testsuite/tests/typecheck/should_fail/mc23.stderr
@@ -7,8 +7,9 @@ mc23.hs:9:15:
     Note: there are several potential instances:
       instance Enum Double -- Defined in `GHC.Float'
       instance Enum Float -- Defined in `GHC.Float'
-      instance Enum () -- Defined in `GHC.Enum'
-      ...plus five others
+      instance Integral a => Enum (GHC.Real.Ratio a)
+        -- Defined in `GHC.Real'
+      ...plus 7 others
     In a stmt of a monad comprehension: x <- [1 .. 10]
     In a stmt of a monad comprehension: then take 5 by x
     In the expression: [x | x <- [1 .. 10], then take 5 by x]
@@ -20,8 +21,9 @@ mc23.hs:9:16:
     Note: there are several potential instances:
       instance Num Double -- Defined in `GHC.Float'
       instance Num Float -- Defined in `GHC.Float'
-      instance Num Int -- Defined in `GHC.Num'
-      ...plus one other
+      instance Integral a => Num (GHC.Real.Ratio a)
+        -- Defined in `GHC.Real'
+      ...plus three others
     In the expression: 1
     In a stmt of a monad comprehension: x <- [1 .. 10]
     In a stmt of a monad comprehension: then take 5 by x
diff --git a/testsuite/tests/typecheck/should_fail/mc24.stderr b/testsuite/tests/typecheck/should_fail/mc24.stderr
index 30d664a3fe..8e1e3824b1 100644
--- a/testsuite/tests/typecheck/should_fail/mc24.stderr
+++ b/testsuite/tests/typecheck/should_fail/mc24.stderr
@@ -7,8 +7,9 @@ mc24.hs:9:14:
     Note: there are several potential instances:
       instance Enum Double -- Defined in `GHC.Float'
       instance Enum Float -- Defined in `GHC.Float'
-      instance Enum () -- Defined in `GHC.Enum'
-      ...plus five others
+      instance Integral a => Enum (GHC.Real.Ratio a)
+        -- Defined in `GHC.Real'
+      ...plus 7 others
     In a stmt of a monad comprehension: x <- [1 .. 10]
     In a stmt of a monad comprehension: then group by x using take 2
     In the expression:
@@ -21,8 +22,9 @@ mc24.hs:9:15:
     Note: there are several potential instances:
       instance Num Double -- Defined in `GHC.Float'
       instance Num Float -- Defined in `GHC.Float'
-      instance Num Int -- Defined in `GHC.Num'
-      ...plus one other
+      instance Integral a => Num (GHC.Real.Ratio a)
+        -- Defined in `GHC.Real'
+      ...plus three others
     In the expression: 1
     In a stmt of a monad comprehension: x <- [1 .. 10]
     In a stmt of a monad comprehension: then group by x using take 2
diff --git a/testsuite/tests/typecheck/should_fail/mc25.stderr b/testsuite/tests/typecheck/should_fail/mc25.stderr
index 8caa47b3b4..53ebd6d9c8 100644
--- a/testsuite/tests/typecheck/should_fail/mc25.stderr
+++ b/testsuite/tests/typecheck/should_fail/mc25.stderr
@@ -7,8 +7,9 @@ mc25.hs:9:15:
     Note: there are several potential instances:
       instance Enum Double -- Defined in `GHC.Float'
       instance Enum Float -- Defined in `GHC.Float'
-      instance Enum () -- Defined in `GHC.Enum'
-      ...plus five others
+      instance Integral a => Enum (GHC.Real.Ratio a)
+        -- Defined in `GHC.Real'
+      ...plus 7 others
     In a stmt of a monad comprehension: x <- [1 .. 10]
     In a stmt of a monad comprehension: then group by x using take
     In the expression: [x | x <- [1 .. 10], then group by x using take]
@@ -20,8 +21,9 @@ mc25.hs:9:16:
     Note: there are several potential instances:
       instance Num Double -- Defined in `GHC.Float'
       instance Num Float -- Defined in `GHC.Float'
-      instance Num Int -- Defined in `GHC.Num'
-      ...plus one other
+      instance Integral a => Num (GHC.Real.Ratio a)
+        -- Defined in `GHC.Real'
+      ...plus three others
     In the expression: 1
     In a stmt of a monad comprehension: x <- [1 .. 10]
     In a stmt of a monad comprehension: then group by x using take
diff --git a/testsuite/tests/typecheck/should_fail/tcfail008.stderr b/testsuite/tests/typecheck/should_fail/tcfail008.stderr
index b50f77e05e..978d946970 100644
--- a/testsuite/tests/typecheck/should_fail/tcfail008.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail008.stderr
@@ -1,7 +1,6 @@
 
 tcfail008.hs:3:5:
-    No instance for (Num a0)
-      arising from the literal `1'
+    No instance for (Num a0) arising from the literal `1'
     The type variable `a0' is ambiguous
     Possible cause: the monomorphism restriction applied to the following:
       o :: [a0] (bound at tcfail008.hs:3:1)
@@ -10,15 +9,15 @@ tcfail008.hs:3:5:
     Note: there are several potential instances:
       instance Num Double -- Defined in `GHC.Float'
       instance Num Float -- Defined in `GHC.Float'
-      instance Num Int -- Defined in `GHC.Num'
-      ...plus one other
+      instance Integral a => Num (GHC.Real.Ratio a)
+        -- Defined in `GHC.Real'
+      ...plus three others
     In the first argument of `(:)', namely `1'
     In the expression: 1 : 2
     In an equation for `o': o = 1 : 2
 
 tcfail008.hs:3:7:
-    No instance for (Num [a0])
-      arising from the literal `2'
+    No instance for (Num [a0]) arising from the literal `2'
     Possible fix: add an instance declaration for (Num [a0])
     In the second argument of `(:)', namely `2'
     In the expression: 1 : 2
diff --git a/testsuite/tests/typecheck/should_fail/tcfail072.stderr b/testsuite/tests/typecheck/should_fail/tcfail072.stderr
index b56f162919..aec686716e 100644
--- a/testsuite/tests/typecheck/should_fail/tcfail072.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail072.stderr
@@ -8,10 +8,10 @@ tcfail072.hs:23:13:
     The type variable `q0' is ambiguous
     Possible fix: add a type signature that fixes these type variable(s)
     Note: there are several potential instances:
+      instance Integral a => Ord (GHC.Real.Ratio a)
+        -- Defined in `GHC.Real'
       instance Ord () -- Defined in `GHC.Classes'
       instance (Ord a, Ord b) => Ord (a, b) -- Defined in `GHC.Classes'
-      instance (Ord a, Ord b, Ord c) => Ord (a, b, c)
-        -- Defined in `GHC.Classes'
-      ...plus 23 others
+      ...plus 25 others
     In the expression: g A
     In an equation for `g': g (B _ _) = g A
diff --git a/testsuite/tests/typecheck/should_fail/tcfail133.stderr b/testsuite/tests/typecheck/should_fail/tcfail133.stderr
index a0c2ca4ec0..042a87a082 100644
--- a/testsuite/tests/typecheck/should_fail/tcfail133.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail133.stderr
@@ -3,8 +3,7 @@ tcfail133.hs:2:61: Warning:
     -XDatatypeContexts is deprecated: It was widely considered a misfeature, and has been removed from the Haskell language.
 
 tcfail133.hs:68:7:
-    No instance for (Show a0)
-      arising from a use of `show'
+    No instance for (Show a0) arising from a use of `show'
     The type variable `a0' is ambiguous
     Possible fix: add a type signature that fixes these type variable(s)
     Note: there are several potential instances:
@@ -12,7 +11,7 @@ tcfail133.hs:68:7:
       instance Show One -- Defined at tcfail133.hs:9:28
       instance (Show a, Show b, Number a, Digit b) => Show (a :@ b)
         -- Defined at tcfail133.hs:11:54
-      ...plus 27 others
+      ...plus 29 others
     In the expression: show
     In the expression: show $ add (One :@ Zero) (One :@ One)
     In an equation for `foo':
diff --git a/testsuite/tests/typecheck/should_fail/tcfail194.stderr b/testsuite/tests/typecheck/should_fail/tcfail194.stderr
index 34cf179439..0e7a63713d 100644
--- a/testsuite/tests/typecheck/should_fail/tcfail194.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail194.stderr
@@ -7,22 +7,23 @@ tcfail194.hs:9:15:
     Note: there are several potential instances:
       instance Enum Double -- Defined in `GHC.Float'
       instance Enum Float -- Defined in `GHC.Float'
-      instance Enum () -- Defined in `GHC.Enum'
-      ...plus five others
+      instance Integral a => Enum (GHC.Real.Ratio a)
+        -- Defined in `GHC.Real'
+      ...plus 7 others
     In the expression: [1 .. 10]
     In a stmt of a list comprehension: x <- [1 .. 10]
     In a stmt of a list comprehension: then take 5 by x
 
 tcfail194.hs:9:16:
-    No instance for (Num t0)
-      arising from the literal `1'
+    No instance for (Num t0) arising from the literal `1'
     The type variable `t0' is ambiguous
     Possible fix: add a type signature that fixes these type variable(s)
     Note: there are several potential instances:
       instance Num Double -- Defined in `GHC.Float'
       instance Num Float -- Defined in `GHC.Float'
-      instance Num Int -- Defined in `GHC.Num'
-      ...plus one other
+      instance Integral a => Num (GHC.Real.Ratio a)
+        -- Defined in `GHC.Real'
+      ...plus three others
     In the expression: 1
     In the expression: [1 .. 10]
     In a stmt of a list comprehension: x <- [1 .. 10]