diff options
| author | Austin Seipp <austin@well-typed.com> | 2014-02-16 19:14:36 -0600 |
|---|---|---|
| committer | Austin Seipp <austin@well-typed.com> | 2014-02-17 01:46:04 -0600 |
| commit | a8a01e742434df11b830ab99af12d9045dfcbc4b (patch) | |
| tree | 959310ee2b5963b1540b93cc3b2416694c7f4688 /testsuite/tests/safeHaskell/ghci | |
| parent | 5023c91780e90947680fe0640f7564a4f6448bea (diff) | |
| download | haskell-a8a01e742434df11b830ab99af12d9045dfcbc4b.tar.gz | |
Fix #8745 - GND is now -XSafe compatible.
As discussed in the ticket, after the landing of #8773, GND is now
-XSafe compatible.
This fixes the test fallout as well. In particular SafeLang07 was
removed following in the steps of SafeLang06, since it no longer failed
from GND, but failed due to roles and was thus invalid.
The other tests were tweaked to use TemplateHaskell instead of GND in
order to trigger safety warnings.
Signed-off-by: Austin Seipp <austin@well-typed.com>
Diffstat (limited to 'testsuite/tests/safeHaskell/ghci')
| -rw-r--r-- | testsuite/tests/safeHaskell/ghci/p1.stderr | 3 | ||||
| -rw-r--r-- | testsuite/tests/safeHaskell/ghci/p16.stderr | 15 | ||||
| -rw-r--r-- | testsuite/tests/safeHaskell/ghci/p16.stdout | 1 |
3 files changed, 1 insertions, 18 deletions
diff --git a/testsuite/tests/safeHaskell/ghci/p1.stderr b/testsuite/tests/safeHaskell/ghci/p1.stderr index 9446e1df16..6ebe783322 100644 --- a/testsuite/tests/safeHaskell/ghci/p1.stderr +++ b/testsuite/tests/safeHaskell/ghci/p1.stderr @@ -1,6 +1,3 @@ <no location info>: Warning: -XTemplateHaskell is not allowed in Safe Haskell; ignoring -XTemplateHaskell - -<no location info>: Warning: - -XGeneralizedNewtypeDeriving is not allowed in Safe Haskell; ignoring -XGeneralizedNewtypeDeriving diff --git a/testsuite/tests/safeHaskell/ghci/p16.stderr b/testsuite/tests/safeHaskell/ghci/p16.stderr index 77d3b1bed1..e69de29bb2 100644 --- a/testsuite/tests/safeHaskell/ghci/p16.stderr +++ b/testsuite/tests/safeHaskell/ghci/p16.stderr @@ -1,15 +0,0 @@ - -<no location info>: Warning: - -XGeneralizedNewtypeDeriving is not allowed in Safe Haskell; ignoring -XGeneralizedNewtypeDeriving - -<interactive>:16:29: - Can't make a derived instance of ‛Op T2’: - ‛Op’ is not a derivable class - Try GeneralizedNewtypeDeriving for GHC's newtype-deriving extension - In the newtype declaration for ‛T2’ - -<interactive>:19:9: - Not in scope: data constructor ‛T2’ - Perhaps you meant ‛T1’ (line 13) - -<interactive>:22:4: Not in scope: ‛y’ diff --git a/testsuite/tests/safeHaskell/ghci/p16.stdout b/testsuite/tests/safeHaskell/ghci/p16.stdout index 233a1e18c7..596c874083 100644 --- a/testsuite/tests/safeHaskell/ghci/p16.stdout +++ b/testsuite/tests/safeHaskell/ghci/p16.stdout @@ -1 +1,2 @@ "t1" +"T" |