[commit: packages/bytestring] ghc-head: Tidy up a few more uses of extensions (16772aa)

git at git.haskell.org git
Thu Oct 10 08:56:25 UTC 2013


Repository : ssh://git at git.haskell.org/bytestring

On branch  : ghc-head
Link       : http://git.haskell.org/packages/bytestring.git/commitdiff/16772aab416037e62409c60730112497dccb5d31

>---------------------------------------------------------------

commit 16772aab416037e62409c60730112497dccb5d31
Author: Duncan Coutts <duncan at community.haskell.org>
Date:   Sun Oct 6 19:03:16 2013 +0100

    Tidy up a few more uses of extensions
    
    Noticed by hvr.


>---------------------------------------------------------------

16772aab416037e62409c60730112497dccb5d31
 Data/ByteString.hs                    |    2 +-
 Data/ByteString/Builder/Prim/ASCII.hs |    2 +-
 bytestring.cabal                      |    2 ++
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/Data/ByteString.hs b/Data/ByteString.hs
index 4dc9d16..0d4a88f 100644
--- a/Data/ByteString.hs
+++ b/Data/ByteString.hs
@@ -1,7 +1,7 @@
 {-# LANGUAGE CPP #-}
 #if __GLASGOW_HASKELL__
 {-# LANGUAGE MagicHash, UnboxedTuples,
-            NamedFieldPuns, BangPatterns, RecordWildCards #-}
+            NamedFieldPuns, BangPatterns #-}
 #endif
 {-# OPTIONS_HADDOCK prune #-}
 #if __GLASGOW_HASKELL__ >= 701
diff --git a/Data/ByteString/Builder/Prim/ASCII.hs b/Data/ByteString/Builder/Prim/ASCII.hs
index d7a874a..9ed8316 100644
--- a/Data/ByteString/Builder/Prim/ASCII.hs
+++ b/Data/ByteString/Builder/Prim/ASCII.hs
@@ -1,4 +1,4 @@
-{-# LANGUAGE ScopedTypeVariables, CPP, ForeignFunctionInterface #-}
+{-# LANGUAGE ScopedTypeVariables, ForeignFunctionInterface #-}
 -- | Copyright   : (c) 2010 Jasper Van der Jeugt
 --                 (c) 2010 - 2011 Simon Meier
 -- License       : BSD3-style (see LICENSE)
diff --git a/bytestring.cabal b/bytestring.cabal
index 7925707..3c60943 100644
--- a/bytestring.cabal
+++ b/bytestring.cabal
@@ -118,6 +118,8 @@ library
                      ScopedTypeVariables
                      RankNTypes
                      NamedFieldPuns
+  if impl(ghc >= 7.2)
+    other-extensions: Trustworthy, Unsafe
   -- older ghc had issues with language pragmas guarded by cpp
   if impl(ghc < 7)
     default-extensions: CPP, MagicHash, UnboxedTuples,




More information about the ghc-commits mailing list