Repository : ssh://darcs.haskell.org//srv/darcs/testsuite On branch : ghc-generics
http://hackage.haskell.org/trac/ghc/changeset/94637701b944cd912b7832fdda5b28a2cdb9d727 >--------------------------------------------------------------- commit 94637701b944cd912b7832fdda5b28a2cdb9d727 Author: Jose Pedro Magalhaes <[email protected]> Date: Tue May 3 13:21:00 2011 +0200 Adapt outputs for the fact that the hasGenerics field is gone. >--------------------------------------------------------------- tests/ghc-regress/driver/T4437.hs | 1 + .../indexed-types/should_compile/T3017.stderr | 2 -- .../rename/should_fail/rnfail055.stderr | 10 ---------- .../simplCore/should_compile/T4930.stderr | 2 +- .../typecheck/should_compile/tc168.stderr | 1 - .../typecheck/should_compile/tc231.stderr | 3 --- .../ghc-regress/typecheck/should_fail/T3468.stderr | 2 -- 7 files changed, 2 insertions(+), 19 deletions(-) diff --git a/tests/ghc-regress/driver/T4437.hs b/tests/ghc-regress/driver/T4437.hs index 46aa9a4..07ca2e5 100644 --- a/tests/ghc-regress/driver/T4437.hs +++ b/tests/ghc-regress/driver/T4437.hs @@ -14,6 +14,7 @@ main = do let ghcExtensions = [ ext | (ext, _, _) <- xFlags ] expectedGhcOnlyExtensions = ["ParallelArrays", "RelaxedLayout", + "DeriveRepresentable", "AlternativeLayoutRule", "AlternativeLayoutRuleTransitional"] unexpectedGhcOnlyExtension = ghcOnlyExtensions diff --git a/tests/ghc-regress/indexed-types/should_compile/T3017.stderr b/tests/ghc-regress/indexed-types/should_compile/T3017.stderr index eb4d2e5..949960d 100644 --- a/tests/ghc-regress/indexed-types/should_compile/T3017.stderr +++ b/tests/ghc-regress/indexed-types/should_compile/T3017.stderr @@ -6,13 +6,11 @@ TYPE SIGNATURES TYPE CONSTRUCTORS data ListColl a RecFlag NonRecursive - Generics: no = L :: forall a. [a] -> ListColl a Stricts: _ FamilyInstance: none INSTANCES instance Coll (ListColl a) -- Defined at T3017.hs:12:11-27 FAMILY INSTANCES type Elem (ListColl a) -- Defined at T3017.hs:13:9-12 -Tycons with generics: Dependent modules: [] Dependent packages: [base, ghc-prim, integer-gmp] diff --git a/tests/ghc-regress/rename/should_fail/rnfail055.stderr b/tests/ghc-regress/rename/should_fail/rnfail055.stderr index 84b2dfa..d6947a2 100644 --- a/tests/ghc-regress/rename/should_fail/rnfail055.stderr +++ b/tests/ghc-regress/rename/should_fail/rnfail055.stderr @@ -26,12 +26,10 @@ RnFail055.hs-boot:12:6: Type constructor `T1' has conflicting definitions in the module and its hs-boot file Main module: data T1 a b RecFlag Recursive - Generics: no = T1 :: forall a b. [b] -> [a] -> T1 a b Stricts: _ _ FamilyInstance: none Boot file: data T1 a b RecFlag NonRecursive - Generics: no = T1 :: forall a b. [a] -> [b] -> T1 a b Stricts: _ _ FamilyInstance: none @@ -39,12 +37,10 @@ RnFail055.hs-boot:14:16: Type constructor `T2' has conflicting definitions in the module and its hs-boot file Main module: data Eq b => T2 a b RecFlag Recursive - Generics: no = T2 :: forall a b. a -> T2 a b Stricts: _ FamilyInstance: none Boot file: data Eq a => T2 a b RecFlag NonRecursive - Generics: no = T2 :: forall a b. a -> T2 a b Stricts: _ FamilyInstance: none @@ -58,12 +54,10 @@ RnFail055.hs-boot:21:6: Type constructor `T5' has conflicting definitions in the module and its hs-boot file Main module: data T5 a RecFlag Recursive - Generics: no = T5 :: forall a. a -> T5 a Stricts: _ Fields: field5 FamilyInstance: none Boot file: data T5 a RecFlag NonRecursive - Generics: no = T5 :: forall a. a -> T5 a Stricts: _ FamilyInstance: none @@ -71,12 +65,10 @@ RnFail055.hs-boot:23:6: Type constructor `T6' has conflicting definitions in the module and its hs-boot file Main module: data T6 RecFlag Recursive - Generics: no = T6 :: Int -> T6 Stricts: _ FamilyInstance: none Boot file: data T6 RecFlag NonRecursive - Generics: no = T6 :: Int -> T6 HasWrapper Stricts: ! FamilyInstance: none @@ -84,12 +76,10 @@ RnFail055.hs-boot:25:6: Type constructor `T7' has conflicting definitions in the module and its hs-boot file Main module: data T7 a RecFlag Recursive - Generics: no = T7 :: forall a a. a -> T7 a Stricts: _ FamilyInstance: none Boot file: data T7 a RecFlag NonRecursive - Generics: no = T7 :: forall a b. a -> T7 a Stricts: _ FamilyInstance: none diff --git a/tests/ghc-regress/simplCore/should_compile/T4930.stderr b/tests/ghc-regress/simplCore/should_compile/T4930.stderr index e7ec6e7..bb1637c 100644 --- a/tests/ghc-regress/simplCore/should_compile/T4930.stderr +++ b/tests/ghc-regress/simplCore/should_compile/T4930.stderr @@ -2,7 +2,7 @@ ==================== Tidy Core ==================== lvl :: [GHC.Types.Char] [GblId] -lvl = GHC.Base.unpackCString# "Too small" +lvl = GHC.CString.unpackCString# "Too small" T4930.foo1 :: GHC.Types.Int [GblId, Str=DmdType b] diff --git a/tests/ghc-regress/typecheck/should_compile/tc168.stderr b/tests/ghc-regress/typecheck/should_compile/tc168.stderr index d05d4fc..68c0d39 100644 --- a/tests/ghc-regress/typecheck/should_compile/tc168.stderr +++ b/tests/ghc-regress/typecheck/should_compile/tc168.stderr @@ -1,6 +1,5 @@ TYPE SIGNATURES f :: forall a b a1. C a1 (a, b) => a1 -> a TYPE CONSTRUCTORS -Tycons with generics: Dependent modules: [] Dependent packages: [base, ghc-prim, integer-gmp] diff --git a/tests/ghc-regress/typecheck/should_compile/tc231.stderr b/tests/ghc-regress/typecheck/should_compile/tc231.stderr index 4f87455..af53fa9 100644 --- a/tests/ghc-regress/typecheck/should_compile/tc231.stderr +++ b/tests/ghc-regress/typecheck/should_compile/tc231.stderr @@ -6,15 +6,12 @@ TYPE SIGNATURES TYPE CONSTRUCTORS data Q s a chain RecFlag NonRecursive - Generics: no = Node :: forall s a chain. s -> a -> chain -> Q s a chain Stricts: _ _ _ FamilyInstance: none data Z a RecFlag NonRecursive - Generics: no = Z :: forall a. a -> Z a Stricts: _ FamilyInstance: none -Tycons with generics: Dependent modules: [] Dependent packages: [base, ghc-prim, integer-gmp] diff --git a/tests/ghc-regress/typecheck/should_fail/T3468.stderr b/tests/ghc-regress/typecheck/should_fail/T3468.stderr index 55e94b9..020d104 100644 --- a/tests/ghc-regress/typecheck/should_fail/T3468.stderr +++ b/tests/ghc-regress/typecheck/should_fail/T3468.stderr @@ -3,11 +3,9 @@ T3468.hs-boot:3:6: Type constructor `Tool' has conflicting definitions in the module and its hs-boot file Main module: data Tool d RecFlag Recursive - Generics: no = F :: forall d a r. a -> Tool d Stricts: _ FamilyInstance: none Boot file: data Tool RecFlag NonRecursive - Generics: no {- abstract -} FamilyInstance: none _______________________________________________ Cvs-ghc mailing list [email protected] http://www.haskell.org/mailman/listinfo/cvs-ghc
