Repository : ssh://darcs.haskell.org//srv/darcs/testsuite On branch : ghc-generics
http://hackage.haskell.org/trac/ghc/changeset/b17231f3c59db863c4d70ebcacce428769af6e9d >--------------------------------------------------------------- commit b17231f3c59db863c4d70ebcacce428769af6e9d Author: Jose Pedro Magalhaes <[email protected]> Date: Mon May 9 11:52:41 2011 +0200 Adapt to the improved error output. >--------------------------------------------------------------- tests/ghc-regress/generics/GenCannotDoRep0.stderr | 4 ++-- tests/ghc-regress/generics/GenCannotDoRep1.stderr | 4 ++-- tests/ghc-regress/generics/GenCannotDoRep2.stderr | 4 ++-- tests/ghc-regress/generics/GenDeprecated.hs | 2 +- tests/ghc-regress/generics/GenDeprecated.stderr | 2 +- tests/ghc-regress/generics/GenShouldFail0.stderr | 4 +--- tests/ghc-regress/generics/Uniplate/GUniplate.hs | 2 +- tests/ghc-regress/generics/Uniplate/Main.hs | 2 +- tests/ghc-regress/generics/Uniplate/test.T | 2 +- tests/ghc-regress/generics/all.T | 11 ++++++----- 10 files changed, 18 insertions(+), 19 deletions(-) diff --git a/tests/ghc-regress/generics/GenCannotDoRep0.stderr b/tests/ghc-regress/generics/GenCannotDoRep0.stderr index 6ede199..b1f1113 100644 --- a/tests/ghc-regress/generics/GenCannotDoRep0.stderr +++ b/tests/ghc-regress/generics/GenCannotDoRep0.stderr @@ -1,5 +1,5 @@ -CannotDoRep0.hs:9:45: +GenCannotDoRep0.hs:9:45: Can't make a derived instance of `Generic Dynamic': - Cannot derive Generic for type Dynamic + Dynamic is not a vanilla data constructor In the data type declaration for `Dynamic' diff --git a/tests/ghc-regress/generics/GenCannotDoRep1.stderr b/tests/ghc-regress/generics/GenCannotDoRep1.stderr index 6c66998..6927a0f 100644 --- a/tests/ghc-regress/generics/GenCannotDoRep1.stderr +++ b/tests/ghc-regress/generics/GenCannotDoRep1.stderr @@ -1,5 +1,5 @@ -CannotDoRep1.hs:8:49: +GenCannotDoRep1.hs:8:49: Can't make a derived instance of `Generic (Context a)': - Cannot derive Generic for type Context + Context has a datatype context In the data type declaration for `Context' diff --git a/tests/ghc-regress/generics/GenCannotDoRep2.stderr b/tests/ghc-regress/generics/GenCannotDoRep2.stderr index ae6eb2f..7c4adf4 100644 --- a/tests/ghc-regress/generics/GenCannotDoRep2.stderr +++ b/tests/ghc-regress/generics/GenCannotDoRep2.stderr @@ -1,5 +1,5 @@ -CannotDoRep2.hs:13:1: +GenCannotDoRep2.hs:13:1: Can't make a derived instance of `Generic (Term a)': - Cannot derive Generic for type Term + Int is not a vanilla data constructor In the stand-alone deriving instance for `Generic (Term a)' diff --git a/tests/ghc-regress/generics/GenDeprecated.hs b/tests/ghc-regress/generics/GenDeprecated.hs index 322d660..be3984d 100644 --- a/tests/ghc-regress/generics/GenDeprecated.hs +++ b/tests/ghc-regress/generics/GenDeprecated.hs @@ -1,3 +1,3 @@ {-# LANGUAGE Generics #-} -module GenericsDeprecated where +module GenDeprecated where diff --git a/tests/ghc-regress/generics/GenDeprecated.stderr b/tests/ghc-regress/generics/GenDeprecated.stderr index be497bd..d07c35d 100644 --- a/tests/ghc-regress/generics/GenDeprecated.stderr +++ b/tests/ghc-regress/generics/GenDeprecated.stderr @@ -1,3 +1,3 @@ -GenericsDeprecated.hs:1:14: +GenDeprecated.hs:1:14: Warning: -XGenerics is deprecated: it does nothing; look into -XDefaultSignatures and -XDeriveGeneric for generic programming support. diff --git a/tests/ghc-regress/generics/GenShouldFail0.stderr b/tests/ghc-regress/generics/GenShouldFail0.stderr index adc81ca..3685e67 100644 --- a/tests/ghc-regress/generics/GenShouldFail0.stderr +++ b/tests/ghc-regress/generics/GenShouldFail0.stderr @@ -1,7 +1,5 @@ -ShouldFail0.hs:9:1: +GenShouldFail0.hs:9:1: Can't make a derived instance of `Generic X': You need -XDeriveGeneric to derive an instance for this class - or - You need -XGenerics to derive an instance for this class In the stand-alone deriving instance for `Generic X' diff --git a/tests/ghc-regress/generics/Uniplate/GUniplate.hs b/tests/ghc-regress/generics/Uniplate/GUniplate.hs index 9243db9..7b08c7e 100644 --- a/tests/ghc-regress/generics/Uniplate/GUniplate.hs +++ b/tests/ghc-regress/generics/Uniplate/GUniplate.hs @@ -6,7 +6,7 @@ {-# LANGUAGE DefaultSignatures #-} {-# LANGUAGE IncoherentInstances #-} -- necessary, unfortunately -module Uniplate where +module GUniplate where import GHC.Generics diff --git a/tests/ghc-regress/generics/Uniplate/Main.hs b/tests/ghc-regress/generics/Uniplate/Main.hs index 6df4519..95d8424 100644 --- a/tests/ghc-regress/generics/Uniplate/Main.hs +++ b/tests/ghc-regress/generics/Uniplate/Main.hs @@ -3,7 +3,7 @@ module Main where import GHC.Generics -import Uniplate +import GUniplate data Tree = Leaf | Node Int Tree Tree deriving (Show, Generic) diff --git a/tests/ghc-regress/generics/Uniplate/test.T b/tests/ghc-regress/generics/Uniplate/test.T index 100c12a..a1e6107 100644 --- a/tests/ghc-regress/generics/Uniplate/test.T +++ b/tests/ghc-regress/generics/Uniplate/test.T @@ -1,3 +1,3 @@ setTestOpts(only_compiler_types(['ghc'])) -test('Uniplate1', normal, multimod_compile_and_run, ['Main', '']) \ No newline at end of file +test('GUniplate1', normal, multimod_compile_and_run, ['Main', '']) \ No newline at end of file diff --git a/tests/ghc-regress/generics/all.T b/tests/ghc-regress/generics/all.T index 7212a72..2041ea9 100644 --- a/tests/ghc-regress/generics/all.T +++ b/tests/ghc-regress/generics/all.T @@ -1,8 +1,9 @@ setTestOpts(only_compiler_types(['ghc'])) -test('CanDoRep0', normal, compile, ['']) +test('GenCanDoRep0', normal, compile, ['']) -test('ShouldFail0', normal, compile_fail, ['']) -test('CannotDoRep0', normal, compile_fail, ['']) -test('CannotDoRep1', normal, compile_fail, ['']) -test('CannotDoRep2', normal, compile_fail, ['']) +test('GenDeprecated', normal, compile, ['']) +test('GenShouldFail0', normal, compile_fail, ['']) +test('GenCannotDoRep0', normal, compile_fail, ['']) +test('GenCannotDoRep1', normal, compile_fail, ['']) +test('GenCannotDoRep2', normal, compile_fail, ['']) _______________________________________________ Cvs-ghc mailing list [email protected] http://www.haskell.org/mailman/listinfo/cvs-ghc
