diff options
| author | Ben Gamari <ben@smart-cactus.org> | 2019-09-16 10:51:08 -0400 |
|---|---|---|
| committer | Marge Bot <ben+marge-bot@smart-cactus.org> | 2019-09-25 13:55:09 -0400 |
| commit | d90d0bade05fa63b81fe68d42c4242dd97c46e77 (patch) | |
| tree | f6afc378d35fde0a90bb8ff0b558fd4dda3c265d /testsuite/tests | |
| parent | ebc65025435b1c441cfd9fa3dd460201cea4576d (diff) | |
| download | haskell-d90d0bade05fa63b81fe68d42c4242dd97c46e77.tar.gz | |
base: Move Ix typeclass to GHC.Ix
The `Ix` class seems rather orthogonal to its original home in
`GHC.Arr`.
Diffstat (limited to 'testsuite/tests')
| -rw-r--r-- | testsuite/tests/deriving/should_compile/T14682.stderr | 34 | ||||
| -rw-r--r-- | testsuite/tests/ghci/scripts/ghci064.stdout | 2 |
2 files changed, 18 insertions, 18 deletions
diff --git a/testsuite/tests/deriving/should_compile/T14682.stderr b/testsuite/tests/deriving/should_compile/T14682.stderr index 7656c9c3b8..59fc405cdb 100644 --- a/testsuite/tests/deriving/should_compile/T14682.stderr +++ b/testsuite/tests/deriving/should_compile/T14682.stderr @@ -18,7 +18,7 @@ Derived class instances: <a1, Language.Haskell.TH.Syntax.lift a1>] Language.Haskell.TH.Syntax.liftTyped (T14682.Foo a1 a2) = [|| T14682.Foo a1 a2 ||] - + instance Data.Data.Data T14682.Foo where Data.Data.gfoldl k z (T14682.Foo a1 a2) = ((z T14682.Foo `k` a1) `k` a2) @@ -54,22 +54,22 @@ Derived class instances: (GHC.Classes.>) a b = (GHC.Classes.<) b a (GHC.Classes.>=) a b = GHC.Classes.not ((GHC.Classes.<) a b) - instance GHC.Arr.Ix T14682.Foo where - GHC.Arr.range (T14682.Foo a1 a2, T14682.Foo b1 b2) + instance GHC.Ix.Ix T14682.Foo where + GHC.Ix.range (T14682.Foo a1 a2, T14682.Foo b1 b2) = [T14682.Foo c1 c2 | - c1 <- GHC.Arr.range (a1, b1), c2 <- GHC.Arr.range (a2, b2)] - GHC.Arr.unsafeIndex + c1 <- GHC.Ix.range (a1, b1), c2 <- GHC.Ix.range (a2, b2)] + GHC.Ix.unsafeIndex (T14682.Foo a1 a2, T14682.Foo b1 b2) (T14682.Foo c1 c2) - = (GHC.Arr.unsafeIndex (a2, b2) c2 + = (GHC.Ix.unsafeIndex (a2, b2) c2 GHC.Num.+ - (GHC.Arr.unsafeRangeSize (a2, b2) - GHC.Num.* GHC.Arr.unsafeIndex (a1, b1) c1)) - GHC.Arr.inRange + (GHC.Ix.unsafeRangeSize (a2, b2) + GHC.Num.* GHC.Ix.unsafeIndex (a1, b1) c1)) + GHC.Ix.inRange (T14682.Foo a1 a2, T14682.Foo b1 b2) (T14682.Foo c1 c2) - = (GHC.Arr.inRange (a1, b1) c1 - GHC.Classes.&& GHC.Arr.inRange (a2, b2) c2) + = (GHC.Ix.inRange (a1, b1) c1 + GHC.Classes.&& GHC.Ix.inRange (a2, b2) c2) T14682.$con2tag_B4iUvrAY4wB3YczpMJQUOX :: T14682.Foo -> GHC.Prim.Int# @@ -175,19 +175,19 @@ GHC.Classes.Ord [T14682.Foo] ==================== Filling in method body ==================== -GHC.Arr.Ix [T14682.Foo] - GHC.Arr.index = GHC.Arr.$dmindex @(T14682.Foo) +GHC.Ix.Ix [T14682.Foo] + GHC.Ix.index = GHC.Ix.$dmindex @(T14682.Foo) ==================== Filling in method body ==================== -GHC.Arr.Ix [T14682.Foo] - GHC.Arr.rangeSize = GHC.Arr.$dmrangeSize @(T14682.Foo) +GHC.Ix.Ix [T14682.Foo] + GHC.Ix.rangeSize = GHC.Ix.$dmrangeSize @(T14682.Foo) ==================== Filling in method body ==================== -GHC.Arr.Ix [T14682.Foo] - GHC.Arr.unsafeRangeSize = GHC.Arr.$dmunsafeRangeSize @(T14682.Foo) +GHC.Ix.Ix [T14682.Foo] + GHC.Ix.unsafeRangeSize = GHC.Ix.$dmunsafeRangeSize @(T14682.Foo) diff --git a/testsuite/tests/ghci/scripts/ghci064.stdout b/testsuite/tests/ghci/scripts/ghci064.stdout index 91298153fc..e3fe5a9804 100644 --- a/testsuite/tests/ghci/scripts/ghci064.stdout +++ b/testsuite/tests/ghci/scripts/ghci064.stdout @@ -38,7 +38,7 @@ instance Show Bool -- Defined in ‘GHC.Show’ instance Read Bool -- Defined in ‘GHC.Read’ instance Bounded Bool -- Defined in ‘GHC.Enum’ instance GHC.Generics.Generic Bool -- Defined in ‘GHC.Generics’ -instance GHC.Arr.Ix Bool -- Defined in ‘GHC.Arr’ +instance GHC.Ix.Ix Bool -- Defined in ‘GHC.Ix’ instance GHC.Generics.SingKind Bool -- Defined in ‘GHC.Generics’ instance Data.Bits.Bits Bool -- Defined in ‘Data.Bits’ instance Data.Bits.FiniteBits Bool -- Defined in ‘Data.Bits’ |