summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorReid Barton <rwbarton@gmail.com>2013-09-29 18:42:35 -0400
committerKrzysztof Gogolewski <krz.gogolewski@gmail.com>2013-09-30 12:31:25 +0200
commit7ff4696eb78b02f6bd7a817ecbb29b27300930de (patch)
treeca620725d801a5f41e5f48d211916eb4a3396ce4
parent5d1205475913bc5106497cfaa92b07ae321314f3 (diff)
downloadhaskell-7ff4696eb78b02f6bd7a817ecbb29b27300930de.tar.gz
Update spec001 for new Typeable, and disable AMP warning
I'd like to just "import Prelude hiding (..., join)", but the patch to make that turn off the warning hasn't been merged yet.
-rw-r--r--testsuite/tests/simplCore/should_compile/spec001.hs4
1 files changed, 2 insertions, 2 deletions
diff --git a/testsuite/tests/simplCore/should_compile/spec001.hs b/testsuite/tests/simplCore/should_compile/spec001.hs
index 0abfd6a5a5..0afdaf4a5b 100644
--- a/testsuite/tests/simplCore/should_compile/spec001.hs
+++ b/testsuite/tests/simplCore/should_compile/spec001.hs
@@ -1,5 +1,6 @@
{-# LANGUAGE CPP, UnboxedTuples, MagicHash, StandaloneDeriving, DeriveDataTypeable #-}
{-# OPTIONS_GHC -O #-}
+{-# OPTIONS_GHC -fno-warn-amp #-}
-- In GHC 6.4, compiling this module gave a Core Lint failure following the
-- specialier, because a function was floated out that had a RULE that
@@ -136,8 +137,7 @@ comparePS (PS off1 len1 fp1) (PS off2 len2 fp2)
instance Show PackedString where
showsPrec p ps r = showsPrec p (unpack ps) r
-#include "Typeable.h"
-INSTANCE_TYPEABLE0(PackedString,packedStringTc,"PackedString")
+deriving instance Typeable PackedString
-- -----------------------------------------------------------------------------
-- Constructor functions