summaryrefslogtreecommitdiff
path: root/testsuite/tests/ghci/scripts
diff options
context:
space:
mode:
authorMatthew Pickering <matthewtpickering@gmail.com>2021-04-07 10:57:06 +0100
committerMarge Bot <ben+marge-bot@smart-cactus.org>2021-04-14 05:07:45 -0400
commit726da09e76d0832b5aedd5b78624435695ac04e7 (patch)
tree61c013968fc4a218562a647c1860696ef9ff95a8 /testsuite/tests/ghci/scripts
parentb665d9833b13d9d4241ff56585bbf45d2fcf2278 (diff)
downloadhaskell-726da09e76d0832b5aedd5b78624435695ac04e7.tar.gz
Always generate ModDetails from ModIface
This vastly reduces memory usage when compiling with `--make` mode, from about 900M when compiling Cabal to about 300M. As a matter of uniformity, it also ensures that reading from an interface performs the same as using the in-memory cache. We can also delete all the horrible knot-tying in updateIdInfos. Goes some way to fixing #13586 Accept new output of tests fixing some bugs along the way ------------------------- Metric Decrease: T12545 -------------------------
Diffstat (limited to 'testsuite/tests/ghci/scripts')
-rw-r--r--testsuite/tests/ghci/scripts/T10321.stdout2
-rw-r--r--testsuite/tests/ghci/scripts/T15872.stdout4
-rw-r--r--testsuite/tests/ghci/scripts/T4175.stdout4
-rw-r--r--testsuite/tests/ghci/scripts/ghci025.stdout6
-rw-r--r--testsuite/tests/ghci/scripts/ghci064.stdout2
5 files changed, 9 insertions, 9 deletions
diff --git a/testsuite/tests/ghci/scripts/T10321.stdout b/testsuite/tests/ghci/scripts/T10321.stdout
index d74ca959a6..c905982364 100644
--- a/testsuite/tests/ghci/scripts/T10321.stdout
+++ b/testsuite/tests/ghci/scripts/T10321.stdout
@@ -1 +1 @@
-3 :> 4 :> 5 :> Nil :: Num a => Vec 3 a
+3 :> 4 :> 5 :> Nil :: Num b => Vec 3 b
diff --git a/testsuite/tests/ghci/scripts/T15872.stdout b/testsuite/tests/ghci/scripts/T15872.stdout
index e1aa200425..ae90ea73f2 100644
--- a/testsuite/tests/ghci/scripts/T15872.stdout
+++ b/testsuite/tests/ghci/scripts/T15872.stdout
@@ -1,11 +1,11 @@
-MkFun :: (a -> b) -> Fun a b
+MkFun :: (b -> c) -> Fun b c
Fun :: (a ~ 'OP) => * -> * -> *
type Fun :: forall (a :: WHICH). (a ~ 'OP) => * -> * -> *
data Fun b c where
MkFun :: (b -> c) -> Fun b c
-- Defined at T15872.hs:11:1
MkFun
- :: (a -> b) -> Fun @'OP @{'GHC.Types.Eq# @WHICH @'OP @'OP <>} a b
+ :: (b -> c) -> Fun @'OP @{'GHC.Types.Eq# @WHICH @'OP @'OP <>} b c
Fun :: ((a :: WHICH) ~ ('OP :: WHICH)) => * -> * -> *
type role Fun nominal nominal representational representational
type Fun :: forall (a :: WHICH).
diff --git a/testsuite/tests/ghci/scripts/T4175.stdout b/testsuite/tests/ghci/scripts/T4175.stdout
index 9f93304ca9..d15ebb4ce1 100644
--- a/testsuite/tests/ghci/scripts/T4175.stdout
+++ b/testsuite/tests/ghci/scripts/T4175.stdout
@@ -34,9 +34,9 @@ instance Enum () -- Defined in ‘GHC.Enum’
instance Show () -- Defined in ‘GHC.Show’
instance Read () -- Defined in ‘GHC.Read’
instance Bounded () -- Defined in ‘GHC.Enum’
+data instance B () = MkB -- Defined at T4175.hs:14:15
type instance D () () = Bool -- Defined at T4175.hs:23:10
type instance D Int () = String -- Defined at T4175.hs:20:10
-data instance B () = MkB -- Defined at T4175.hs:14:15
type Maybe :: * -> *
data Maybe a = Nothing | Just a
-- Defined in ‘GHC.Maybe’
@@ -67,8 +67,8 @@ instance Show Int -- Defined in ‘GHC.Show’
instance Read Int -- Defined in ‘GHC.Read’
instance Bounded Int -- Defined in ‘GHC.Enum’
instance Integral Int -- Defined in ‘GHC.Real’
-type instance D Int () = String -- Defined at T4175.hs:20:10
type instance A Int Int = () -- Defined at T4175.hs:9:15
+type instance D Int () = String -- Defined at T4175.hs:20:10
type Z :: * -> Constraint
class Z a
-- Defined at T4175.hs:29:1
diff --git a/testsuite/tests/ghci/scripts/ghci025.stdout b/testsuite/tests/ghci/scripts/ghci025.stdout
index 3531825a97..8c6c0ad18b 100644
--- a/testsuite/tests/ghci/scripts/ghci025.stdout
+++ b/testsuite/tests/ghci/scripts/ghci025.stdout
@@ -11,7 +11,7 @@ class C a b
...
c1 :: (C a b, N b) => a -> b
c2 :: (C a b, N b, S b) => a -> b
-c3 :: C a b => a -> b
+c3 :: C a b => a1 -> b
c4 :: C a b => a1 -> b
-- imported via Control.Monad
type MonadPlus :: (* -> *) -> Constraint
@@ -66,7 +66,7 @@ class C a b
...
c1 :: (C a b, N b) => a -> b
c2 :: (C a b, N b, S b) => a -> b
-c3 :: C a b => a -> b
+c3 :: C a b => a1 -> b
c4 :: C a b => a1 -> b
:browse! T -- with -fprint-explicit-foralls
-- defined locally
@@ -80,7 +80,7 @@ class C a b
...
c1 :: forall a b. (C a b, N b) => a -> b
c2 :: forall a b. (C a b, N b, S b) => a -> b
-c3 :: forall a b a. C a b => a -> b
+c3 :: forall a b a1. C a b => a1 -> b
c4 :: forall a b a1. C a b => a1 -> b
-- test :browse! <target> relative to different contexts
:browse! Ghci025C -- from *Ghci025C>
diff --git a/testsuite/tests/ghci/scripts/ghci064.stdout b/testsuite/tests/ghci/scripts/ghci064.stdout
index 0fa911e351..b3437226ca 100644
--- a/testsuite/tests/ghci/scripts/ghci064.stdout
+++ b/testsuite/tests/ghci/scripts/ghci064.stdout
@@ -29,8 +29,8 @@ instance [safe] MyShow w => MyShow [w]
instance Monoid [T] -- Defined in ‘GHC.Base’
instance Semigroup [T] -- Defined in ‘GHC.Base’
instance GHC.Generics.Generic [T] -- Defined in ‘GHC.Generics’
-instance [safe] MyShow [T] -- Defined at ghci064.hs:8:10
instance [safe] MyShow [T] -- Defined at ghci064.hs:16:10
+instance [safe] MyShow [T] -- Defined at ghci064.hs:8:10
instance Eq Bool -- Defined in ‘GHC.Classes’
instance Ord Bool -- Defined in ‘GHC.Classes’
instance Enum Bool -- Defined in ‘GHC.Enum’