diff options
| author | Herbert Valerio Riedel <hvr@gnu.org> | 2014-08-31 11:40:50 +0200 |
|---|---|---|
| committer | Herbert Valerio Riedel <hvr@gnu.org> | 2014-08-31 12:25:16 +0200 |
| commit | 393b820233caa00e428affc28e090b496d181664 (patch) | |
| tree | 3cd003a4d12d3c0d6145a180b25078807970472f /testsuite | |
| parent | b760cc59b26a407dcd5715920c64f53513e65f14 (diff) | |
| download | haskell-393b820233caa00e428affc28e090b496d181664.tar.gz | |
Re-export Word from Prelude (re #9531)
The original proposal text can be found at
http://www.haskell.org/pipermail/libraries/2014-August/023491.html
The proposal passed with a clear majority, and was additionally
confirmed by the core libraries committee.
*Compatibility Note*
Only code that imports `Data.Word` for the sole purpose of using `Word`
*and* requires to be `-Werror`-clean (due to `-fwarn-unused-imports`)
is affected by this change.
In order to write warning-free forward/backward compatible against `base`,
a variant of the following CPP-based snippet can be used:
-- Starting with base>4.7.0 or GHC>7.8 Prelude re-exports 'Word'
-- The following is needed, if 'Word' is the *only* entity needed from Data.Word
#ifdef MIN_VERSION_base
# if !MIN_VERSION_base(4,7,1)
import Data.Word (Word)
# endif
-- no cabal_macros.h -- fallback to __GLASGOW_HASKELL__
#elif __GLASGOW_HASKELL__ < 709
import Data.Word (Word)
#endif
This also updates the haddock submodule in order to avoid a compile warning
Diffstat (limited to 'testsuite')
| -rw-r--r-- | testsuite/tests/lib/integer/IntegerConversionRules.hs | 5 | ||||
| -rw-r--r-- | testsuite/tests/numeric/should_run/T7014.hs | 6 | ||||
| -rw-r--r-- | testsuite/tests/typecheck/should_fail/T5095.stderr | 2 |
3 files changed, 10 insertions, 3 deletions
diff --git a/testsuite/tests/lib/integer/IntegerConversionRules.hs b/testsuite/tests/lib/integer/IntegerConversionRules.hs index cb5269f360..56949e7bf1 100644 --- a/testsuite/tests/lib/integer/IntegerConversionRules.hs +++ b/testsuite/tests/lib/integer/IntegerConversionRules.hs @@ -1,7 +1,10 @@ +{-# LANGUAGE CPP #-} module IntegerConversionRules where -import Data.Word +#if __GLASGOW_HASKELL__ < 709 +import Data.Word (Word) +#endif f1 :: Int -> Double f1 = fi diff --git a/testsuite/tests/numeric/should_run/T7014.hs b/testsuite/tests/numeric/should_run/T7014.hs index 82375389d7..222b33bd59 100644 --- a/testsuite/tests/numeric/should_run/T7014.hs +++ b/testsuite/tests/numeric/should_run/T7014.hs @@ -1,7 +1,11 @@ +{-# LANGUAGE CPP #-} + module Main where import Data.Bits -import Data.Word +#if __GLASGOW_HASKELL__ < 705 +import Data.Word (Word) +#endif test_and1 :: Word -> Word test_and1 x = x .&. 0 diff --git a/testsuite/tests/typecheck/should_fail/T5095.stderr b/testsuite/tests/typecheck/should_fail/T5095.stderr index e8d2b712cd..55342cdf33 100644 --- a/testsuite/tests/typecheck/should_fail/T5095.stderr +++ b/testsuite/tests/typecheck/should_fail/T5095.stderr @@ -53,7 +53,7 @@ T5095.hs:9:11: instance Eq Float -- Defined in ‘GHC.Classes’ instance Eq Int -- Defined in ‘GHC.Classes’ instance Eq Ordering -- Defined in ‘GHC.Classes’ - instance Eq GHC.Types.Word -- Defined in ‘GHC.Classes’ + instance Eq Word -- Defined in ‘GHC.Classes’ instance Eq a => Eq [a] -- Defined in ‘GHC.Classes’ instance Eq Integer -- Defined in ‘integer-gmp-0.5.1.0:GHC.Integer.Type’ |