diff options
Diffstat (limited to 'testsuite')
7 files changed, 73 insertions, 70 deletions
diff --git a/testsuite/tests/dependent/should_fail/T11334b.stderr b/testsuite/tests/dependent/should_fail/T11334b.stderr index effdf20828..62249df4e5 100644 --- a/testsuite/tests/dependent/should_fail/T11334b.stderr +++ b/testsuite/tests/dependent/should_fail/T11334b.stderr @@ -1,7 +1,7 @@ T11334b.hs:8:14: error: • Cannot default kind variable ‘f0’ - of kind: k0 -> * + of kind: k20 -> * Perhaps enable PolyKinds or add a kind signature • In an expression type signature: Proxy 'Compose In the expression: Proxy :: Proxy 'Compose @@ -9,7 +9,7 @@ T11334b.hs:8:14: error: T11334b.hs:8:14: error: • Cannot default kind variable ‘g0’ - of kind: k10 -> k0 + of kind: k10 -> k20 Perhaps enable PolyKinds or add a kind signature • In an expression type signature: Proxy 'Compose In the expression: Proxy :: Proxy 'Compose diff --git a/testsuite/tests/deriving/should_compile/T14578.stderr b/testsuite/tests/deriving/should_compile/T14578.stderr index 58376989db..81fb28a4f4 100644 --- a/testsuite/tests/deriving/should_compile/T14578.stderr +++ b/testsuite/tests/deriving/should_compile/T14578.stderr @@ -13,26 +13,27 @@ Derived class instances: GHC.Real.Integral b => b -> T14578.Wat f g a -> T14578.Wat f g a (GHC.Base.<>) = GHC.Prim.coerce - @(T14578.App (Data.Functor.Compose.Compose f g) a - -> T14578.App (Data.Functor.Compose.Compose f g) a - -> T14578.App (Data.Functor.Compose.Compose f g) a) + @(T14578.App (Data.Functor.Compose.Compose @(TYPE 'GHC.Types.LiftedRep) @(TYPE 'GHC.Types.LiftedRep) f g) a + -> T14578.App (Data.Functor.Compose.Compose @(TYPE 'GHC.Types.LiftedRep) @(TYPE 'GHC.Types.LiftedRep) f g) a + -> T14578.App (Data.Functor.Compose.Compose @(TYPE 'GHC.Types.LiftedRep) @(TYPE 'GHC.Types.LiftedRep) f g) a) @(T14578.Wat f g a -> T14578.Wat f g a -> T14578.Wat f g a) - ((GHC.Base.<>) @(T14578.App (Data.Functor.Compose.Compose f g) a)) + ((GHC.Base.<>) + @(T14578.App (Data.Functor.Compose.Compose @(TYPE 'GHC.Types.LiftedRep) @(TYPE 'GHC.Types.LiftedRep) f g) a)) GHC.Base.sconcat = GHC.Prim.coerce - @(GHC.Base.NonEmpty (T14578.App (Data.Functor.Compose.Compose f g) a) - -> T14578.App (Data.Functor.Compose.Compose f g) a) + @(GHC.Base.NonEmpty (T14578.App (Data.Functor.Compose.Compose @(TYPE 'GHC.Types.LiftedRep) @(TYPE 'GHC.Types.LiftedRep) f g) a) + -> T14578.App (Data.Functor.Compose.Compose @(TYPE 'GHC.Types.LiftedRep) @(TYPE 'GHC.Types.LiftedRep) f g) a) @(GHC.Base.NonEmpty (T14578.Wat f g a) -> T14578.Wat f g a) (GHC.Base.sconcat - @(T14578.App (Data.Functor.Compose.Compose f g) a)) + @(T14578.App (Data.Functor.Compose.Compose @(TYPE 'GHC.Types.LiftedRep) @(TYPE 'GHC.Types.LiftedRep) f g) a)) GHC.Base.stimes = GHC.Prim.coerce @(b - -> T14578.App (Data.Functor.Compose.Compose f g) a - -> T14578.App (Data.Functor.Compose.Compose f g) a) + -> T14578.App (Data.Functor.Compose.Compose @(TYPE 'GHC.Types.LiftedRep) @(TYPE 'GHC.Types.LiftedRep) f g) a + -> T14578.App (Data.Functor.Compose.Compose @(TYPE 'GHC.Types.LiftedRep) @(TYPE 'GHC.Types.LiftedRep) f g) a) @(b -> T14578.Wat f g a -> T14578.Wat f g a) (GHC.Base.stimes - @(T14578.App (Data.Functor.Compose.Compose f g) a)) + @(T14578.App (Data.Functor.Compose.Compose @(TYPE 'GHC.Types.LiftedRep) @(TYPE 'GHC.Types.LiftedRep) f g) a)) instance GHC.Base.Functor f => GHC.Base.Functor (T14578.App f) where diff --git a/testsuite/tests/generics/T10604/T10604_deriving.stderr b/testsuite/tests/generics/T10604/T10604_deriving.stderr index 99c5ee8088..f4dfddd9ae 100644 --- a/testsuite/tests/generics/T10604/T10604_deriving.stderr +++ b/testsuite/tests/generics/T10604/T10604_deriving.stderr @@ -176,7 +176,7 @@ Derived class instances: Derived type family instances: type GHC.Generics.Rep (T10604_deriving.Starify a) = GHC.Generics.D1 - @{*} + @(*) ('GHC.Generics.MetaData "Starify" "T10604_deriving" @@ -185,28 +185,28 @@ Derived type family instances: ((GHC.Generics.:+:) @(*) (GHC.Generics.C1 - @{*} + @(*) ('GHC.Generics.MetaCons "Starify1" 'GHC.Generics.PrefixI 'GHC.Types.False) (GHC.Generics.S1 - @{*} + @(*) ('GHC.Generics.MetaSel ('GHC.Maybe.Nothing @GHC.Types.Symbol) 'GHC.Generics.NoSourceUnpackedness 'GHC.Generics.NoSourceStrictness 'GHC.Generics.DecidedLazy) - (GHC.Generics.Rec0 @{*} a))) + (GHC.Generics.Rec0 @(*) a))) (GHC.Generics.C1 - @{*} + @(*) ('GHC.Generics.MetaCons "Starify2" 'GHC.Generics.PrefixI 'GHC.Types.False) (GHC.Generics.S1 - @{*} + @(*) ('GHC.Generics.MetaSel ('GHC.Maybe.Nothing @GHC.Types.Symbol) @@ -214,22 +214,22 @@ Derived type family instances: 'GHC.Generics.NoSourceStrictness 'GHC.Generics.DecidedLazy) (GHC.Generics.Rec0 - @{*} GHC.Types.Int)))) + @(*) GHC.Types.Int)))) type GHC.Generics.Rep1 @(*) T10604_deriving.Starify = GHC.Generics.D1 - @{*} + @(*) ('GHC.Generics.MetaData "Starify" "T10604_deriving" "main" 'GHC.Types.False) ((GHC.Generics.:+:) @(*) (GHC.Generics.C1 - @{*} + @(*) ('GHC.Generics.MetaCons "Starify1" 'GHC.Generics.PrefixI 'GHC.Types.False) (GHC.Generics.S1 - @{*} + @(*) ('GHC.Generics.MetaSel ('GHC.Maybe.Nothing @GHC.Types.Symbol) 'GHC.Generics.NoSourceUnpackedness @@ -237,22 +237,22 @@ Derived type family instances: 'GHC.Generics.DecidedLazy) GHC.Generics.Par1)) (GHC.Generics.C1 - @{*} + @(*) ('GHC.Generics.MetaCons "Starify2" 'GHC.Generics.PrefixI 'GHC.Types.False) (GHC.Generics.S1 - @{*} + @(*) ('GHC.Generics.MetaSel ('GHC.Maybe.Nothing @GHC.Types.Symbol) 'GHC.Generics.NoSourceUnpackedness 'GHC.Generics.NoSourceStrictness 'GHC.Generics.DecidedLazy) - (GHC.Generics.Rec0 @{*} GHC.Types.Int)))) + (GHC.Generics.Rec0 @(*) GHC.Types.Int)))) type GHC.Generics.Rep (T10604_deriving.SumOfProducts @{k} a) = GHC.Generics.D1 - @{*} + @(*) ('GHC.Generics.MetaData "SumOfProducts" "T10604_deriving" @@ -261,7 +261,7 @@ Derived type family instances: ((GHC.Generics.:+:) @(*) (GHC.Generics.C1 - @{*} + @(*) ('GHC.Generics.MetaCons "Prod1" 'GHC.Generics.PrefixI @@ -269,7 +269,7 @@ Derived type family instances: ((GHC.Generics.:*:) @(*) (GHC.Generics.S1 - @{*} + @(*) ('GHC.Generics.MetaSel ('GHC.Maybe.Nothing @GHC.Types.Symbol) @@ -277,10 +277,10 @@ Derived type family instances: 'GHC.Generics.NoSourceStrictness 'GHC.Generics.DecidedLazy) (GHC.Generics.Rec0 - @{*} + @(*) (T10604_deriving.Proxy @k a))) (GHC.Generics.S1 - @{*} + @(*) ('GHC.Generics.MetaSel ('GHC.Maybe.Nothing @GHC.Types.Symbol) @@ -288,10 +288,10 @@ Derived type family instances: 'GHC.Generics.NoSourceStrictness 'GHC.Generics.DecidedLazy) (GHC.Generics.Rec0 - @{*} + @(*) (T10604_deriving.Proxy @k a))))) (GHC.Generics.C1 - @{*} + @(*) ('GHC.Generics.MetaCons "Prod2" 'GHC.Generics.PrefixI @@ -299,7 +299,7 @@ Derived type family instances: ((GHC.Generics.:*:) @(*) (GHC.Generics.S1 - @{*} + @(*) ('GHC.Generics.MetaSel ('GHC.Maybe.Nothing @GHC.Types.Symbol) @@ -307,10 +307,10 @@ Derived type family instances: 'GHC.Generics.NoSourceStrictness 'GHC.Generics.DecidedLazy) (GHC.Generics.Rec0 - @{*} + @(*) (T10604_deriving.Proxy @k a))) (GHC.Generics.S1 - @{*} + @(*) ('GHC.Generics.MetaSel ('GHC.Maybe.Nothing @GHC.Types.Symbol) @@ -318,11 +318,11 @@ Derived type family instances: 'GHC.Generics.NoSourceStrictness 'GHC.Generics.DecidedLazy) (GHC.Generics.Rec0 - @{*} + @(*) (T10604_deriving.Proxy @k a)))))) type GHC.Generics.Rep1 @k (T10604_deriving.SumOfProducts @{k}) = GHC.Generics.D1 - @{k} + @k ('GHC.Generics.MetaData "SumOfProducts" "T10604_deriving" @@ -331,7 +331,7 @@ Derived type family instances: ((GHC.Generics.:+:) @k (GHC.Generics.C1 - @{k} + @k ('GHC.Generics.MetaCons "Prod1" 'GHC.Generics.PrefixI @@ -339,7 +339,7 @@ Derived type family instances: ((GHC.Generics.:*:) @k (GHC.Generics.S1 - @{k} + @k ('GHC.Generics.MetaSel ('GHC.Maybe.Nothing @GHC.Types.Symbol) @@ -349,7 +349,7 @@ Derived type family instances: (GHC.Generics.Rec1 @k (T10604_deriving.Proxy @k))) (GHC.Generics.S1 - @{k} + @k ('GHC.Generics.MetaSel ('GHC.Maybe.Nothing @GHC.Types.Symbol) @@ -360,7 +360,7 @@ Derived type family instances: @k (T10604_deriving.Proxy @k))))) (GHC.Generics.C1 - @{k} + @k ('GHC.Generics.MetaCons "Prod2" 'GHC.Generics.PrefixI @@ -368,7 +368,7 @@ Derived type family instances: ((GHC.Generics.:*:) @k (GHC.Generics.S1 - @{k} + @k ('GHC.Generics.MetaSel ('GHC.Maybe.Nothing @GHC.Types.Symbol) @@ -378,7 +378,7 @@ Derived type family instances: (GHC.Generics.Rec1 @k (T10604_deriving.Proxy @k))) (GHC.Generics.S1 - @{k} + @k ('GHC.Generics.MetaSel ('GHC.Maybe.Nothing @GHC.Types.Symbol) @@ -390,40 +390,40 @@ Derived type family instances: (T10604_deriving.Proxy @k)))))) type GHC.Generics.Rep (T10604_deriving.Wrap2 @k a) = GHC.Generics.D1 - @{*} + @(*) ('GHC.Generics.MetaData "Wrap2" "T10604_deriving" "main" 'GHC.Types.False) (GHC.Generics.C1 - @{*} + @(*) ('GHC.Generics.MetaCons "Wrap2" 'GHC.Generics.PrefixI 'GHC.Types.False) (GHC.Generics.S1 - @{*} + @(*) ('GHC.Generics.MetaSel ('GHC.Maybe.Nothing @GHC.Types.Symbol) 'GHC.Generics.NoSourceUnpackedness 'GHC.Generics.NoSourceStrictness 'GHC.Generics.DecidedLazy) (GHC.Generics.Rec0 - @{*} + @(*) (T10604_deriving.Proxy @(*) (T10604_deriving.Proxy @(k -> *) a))))) type GHC.Generics.Rep1 @(k -> *) (T10604_deriving.Wrap2 @k) = GHC.Generics.D1 - @{k -> *} + @(k -> *) ('GHC.Generics.MetaData "Wrap2" "T10604_deriving" "main" 'GHC.Types.False) (GHC.Generics.C1 - @{k -> *} + @(k -> *) ('GHC.Generics.MetaCons "Wrap2" 'GHC.Generics.PrefixI 'GHC.Types.False) (GHC.Generics.S1 - @{k -> *} + @(k -> *) ('GHC.Generics.MetaSel ('GHC.Maybe.Nothing @GHC.Types.Symbol) 'GHC.Generics.NoSourceUnpackedness @@ -437,39 +437,39 @@ Derived type family instances: @(k -> *) (T10604_deriving.Proxy @(k -> *)))))) type GHC.Generics.Rep (T10604_deriving.Wrap a) = GHC.Generics.D1 - @{*} + @(*) ('GHC.Generics.MetaData "Wrap" "T10604_deriving" "main" 'GHC.Types.False) (GHC.Generics.C1 - @{*} + @(*) ('GHC.Generics.MetaCons "Wrap" 'GHC.Generics.PrefixI 'GHC.Types.False) (GHC.Generics.S1 - @{*} + @(*) ('GHC.Generics.MetaSel ('GHC.Maybe.Nothing @GHC.Types.Symbol) 'GHC.Generics.NoSourceUnpackedness 'GHC.Generics.NoSourceStrictness 'GHC.Generics.DecidedLazy) (GHC.Generics.Rec0 - @{*} + @(*) (T10604_deriving.Proxy @(* -> *) a)))) type GHC.Generics.Rep1 @(* -> *) T10604_deriving.Wrap = GHC.Generics.D1 - @{* -> *} + @(* -> *) ('GHC.Generics.MetaData "Wrap" "T10604_deriving" "main" 'GHC.Types.False) (GHC.Generics.C1 - @{* -> *} + @(* -> *) ('GHC.Generics.MetaCons "Wrap" 'GHC.Generics.PrefixI 'GHC.Types.False) (GHC.Generics.S1 - @{* -> *} + @(* -> *) ('GHC.Generics.MetaSel ('GHC.Maybe.Nothing @GHC.Types.Symbol) 'GHC.Generics.NoSourceUnpackedness @@ -479,26 +479,26 @@ Derived type family instances: @(* -> *) (T10604_deriving.Proxy @(* -> *))))) type GHC.Generics.Rep (T10604_deriving.Proxy @k a) = GHC.Generics.D1 - @{*} + @(*) ('GHC.Generics.MetaData "Proxy" "T10604_deriving" "main" 'GHC.Types.False) (GHC.Generics.C1 - @{*} + @(*) ('GHC.Generics.MetaCons "Proxy" 'GHC.Generics.PrefixI 'GHC.Types.False) (GHC.Generics.U1 @(*))) type GHC.Generics.Rep1 @k (T10604_deriving.Proxy @k) = GHC.Generics.D1 - @{k} + @k ('GHC.Generics.MetaData "Proxy" "T10604_deriving" "main" 'GHC.Types.False) (GHC.Generics.C1 - @{k} + @k ('GHC.Generics.MetaCons "Proxy" 'GHC.Generics.PrefixI 'GHC.Types.False) (GHC.Generics.U1 @k)) type GHC.Generics.Rep (T10604_deriving.Empty a) = GHC.Generics.D1 - @{*} + @(*) ('GHC.Generics.MetaData "Empty" "T10604_deriving" @@ -507,7 +507,7 @@ Derived type family instances: (GHC.Generics.V1 @(*)) type GHC.Generics.Rep1 @GHC.Types.Bool T10604_deriving.Empty = GHC.Generics.D1 - @{GHC.Types.Bool} + @GHC.Types.Bool ('GHC.Generics.MetaData "Empty" "T10604_deriving" diff --git a/testsuite/tests/ghci/scripts/T12550.stdout b/testsuite/tests/ghci/scripts/T12550.stdout index a3117d02c2..9de82c86f9 100644 --- a/testsuite/tests/ghci/scripts/T12550.stdout +++ b/testsuite/tests/ghci/scripts/T12550.stdout @@ -33,9 +33,11 @@ instance Functor U1 -- Defined in ‘GHC.Generics’ instance ∀ (f ∷ ★ → ★). Functor f ⇒ Functor (Rec1 f) -- Defined in ‘GHC.Generics’ instance Functor Par1 -- Defined in ‘GHC.Generics’ -instance ∀ i (c ∷ Meta) (f ∷ ★ → ★). Functor f ⇒ Functor (M1 i c f) +instance ∀ i (meta ∷ Meta) (f ∷ ★ → ★). + Functor f ⇒ + Functor (M1 i meta f) -- Defined in ‘GHC.Generics’ -instance ∀ i c. Functor (K1 i c) -- Defined in ‘GHC.Generics’ +instance ∀ i a. Functor (K1 i a) -- Defined in ‘GHC.Generics’ instance ∀ (f ∷ ★ → ★) (g ∷ ★ → ★). (Functor f, Functor g) ⇒ Functor (f :.: g) @@ -60,13 +62,13 @@ datatypeName ∷ ∀ {d} {t ∷ ★ → (★ → ★) → ★ → ★} {f ∷ ★ → ★} {a}. Datatype d ⇒ t d f a → [Char] -type Datatype :: ∀ {k}. k → Constraint +type Datatype :: ∀ k. k → Constraint class Datatype d where datatypeName ∷ ∀ k1 (t ∷ k → (k1 → ★) → k1 → ★) (f ∷ k1 → ★) (a ∷ k1). t d f a → [Char] ... -- Defined in ‘GHC.Generics’ -(:*:) ∷ ∀ {f ∷ ★ → ★} {p} {g ∷ ★ → ★}. f p → g p → (:*:) f g p +(:*:) ∷ ∀ {f ∷ ★ → ★} {a} {g ∷ ★ → ★}. f a → g a → (:*:) f g a Rep ∷ ★ → ★ → ★ M1 ∷ ∀ k. ★ → Meta → (k → ★) → k → ★ diff --git a/testsuite/tests/partial-sigs/should_compile/T15039b.stderr b/testsuite/tests/partial-sigs/should_compile/T15039b.stderr index da14f26a17..1f6abf0db4 100644 --- a/testsuite/tests/partial-sigs/should_compile/T15039b.stderr +++ b/testsuite/tests/partial-sigs/should_compile/T15039b.stderr @@ -51,7 +51,7 @@ T15039b.hs:33:14: warning: [-Wpartial-type-signatures (in -Wdefault)] T15039b.hs:35:8: warning: [-Wpartial-type-signatures (in -Wdefault)] • Found type wildcard ‘_’ standing for ‘Coercible @(*) a b’ Where: ‘a’, ‘b’ are rigid type variables bound by - the inferred type of ex7 :: Coercible @(*) a b => Coercion @{*} a b + the inferred type of ex7 :: Coercible @(*) a b => Coercion @(*) a b at T15039b.hs:35:1-44 • In the type signature: ex7 :: _ => Coercion (a :: Type) (b :: Type) diff --git a/testsuite/tests/partial-sigs/should_compile/T15039d.stderr b/testsuite/tests/partial-sigs/should_compile/T15039d.stderr index 68882c391f..0308e52375 100644 --- a/testsuite/tests/partial-sigs/should_compile/T15039d.stderr +++ b/testsuite/tests/partial-sigs/should_compile/T15039d.stderr @@ -52,7 +52,7 @@ T15039d.hs:33:14: warning: [-Wpartial-type-signatures (in -Wdefault)] T15039d.hs:35:8: warning: [-Wpartial-type-signatures (in -Wdefault)] • Found type wildcard ‘_’ standing for ‘Coercible @(*) a b’ Where: ‘a’, ‘b’ are rigid type variables bound by - the inferred type of ex7 :: Coercible @(*) a b => Coercion @{*} a b + the inferred type of ex7 :: Coercible @(*) a b => Coercion @(*) a b at T15039d.hs:35:1-44 • In the type signature: ex7 :: _ => Coercion (a :: Type) (b :: Type) diff --git a/testsuite/tests/typecheck/should_fail/T10285.stderr b/testsuite/tests/typecheck/should_fail/T10285.stderr index 02215e2f70..99edf39591 100644 --- a/testsuite/tests/typecheck/should_fail/T10285.stderr +++ b/testsuite/tests/typecheck/should_fail/T10285.stderr @@ -3,7 +3,7 @@ T10285.hs:8:17: error: • Could not deduce: Coercible a b arising from a use of ‘coerce’ from the context: Coercible (N a) (N b) bound by a pattern with constructor: - Coercion :: forall {k} (a :: k) (b :: k). + Coercion :: forall k (a :: k) (b :: k). Coercible a b => Coercion a b, in an equation for ‘oops’ |