Update base for new Safe Haskell design

Control/Monad/ST.hs

@@ -1,6 +1,8 @@
-{-# LANGUAGE CPP, SafeImports #-}
+{-# LANGUAGE CPP #-}
 #if sh_SAFE_DEFAULT
 {-# LANGUAGE Safe #-}
+#else
+{-# LANGUAGE Unsafe #-}
 #endif
 
 -----------------------------------------------------------------------------
@@ -29,7 +31,7 @@ module Control.Monad.ST (
 #endif
     ) where
 
-import safe Control.Monad.ST.Safe
+import Control.Monad.ST.Safe
 
 #if !sh_SAFE_DEFAULT
 import qualified Control.Monad.ST.Unsafe as U

Control/Monad/ST/Imp.hs

@@ -1,3 +1,4 @@
+{-# LANGUAGE Unsafe #-}
 {-# LANGUAGE CPP #-}
 {-# OPTIONS_HADDOCK hide #-}
 

Control/Monad/ST/Lazy.hs

@@ -1,6 +1,8 @@
-{-# LANGUAGE CPP, SafeImports #-}
+{-# LANGUAGE CPP #-}
 #if sh_SAFE_DEFAULT
 {-# LANGUAGE Safe #-}
+#else
+{-# LANGUAGE Unsafe #-}
 #endif
 
 -----------------------------------------------------------------------------
@@ -28,7 +30,7 @@ module Control.Monad.ST.Lazy (
 #endif
     ) where
 
-import safe Control.Monad.ST.Lazy.Safe
+import Control.Monad.ST.Lazy.Safe
 #if !sh_SAFE_DEFAULT
 import qualified Control.Monad.ST.Lazy.Unsafe as U
 

Control/Monad/ST/Lazy/Imp.hs

@@ -1,3 +1,4 @@
+{-# LANGUAGE Unsafe #-}
 {-# LANGUAGE CPP, MagicHash, UnboxedTuples, Rank2Types #-}
 {-# OPTIONS_HADDOCK hide #-}
 

Control/Monad/ST/Lazy/Unsafe.hs

@@ -1,3 +1,4 @@
+{-# LANGUAGE Unsafe #-}
 -----------------------------------------------------------------------------
 -- |
 -- Module      :  Control.Monad.ST.Lazy.Unsafe

Control/Monad/ST/Strict.hs

@@ -1,6 +1,8 @@
 {-# LANGUAGE CPP #-}
 #if sh_SAFE_DEFAULT
 {-# LANGUAGE Safe #-}
+#else
+{-# LANGUAGE Unsafe #-}
 #endif
 -----------------------------------------------------------------------------
 -- |

Control/Monad/ST/Unsafe.hs

@@ -1,3 +1,4 @@
+{-# LANGUAGE Unsafe #-}
 -----------------------------------------------------------------------------
 -- |
 -- Module      :  Control.Monad.ST.Unsafe

Data/Typeable.hs-boot

@@ -1,3 +1,4 @@
+{-# LANGUAGE Trustworthy #-}
 {-# LANGUAGE NoImplicitPrelude #-}
 
 module Data.Typeable (Typeable, mkTyConApp, cast) where

Data/Typeable/Internal.hs

@@ -1,3 +1,4 @@
+{-# LANGUAGE Unsafe #-}
 -----------------------------------------------------------------------------
 -- |
 -- Module      :  Data.Typeable.Internal

Data/Typeable/Internal.hs-boot

@@ -1,3 +1,4 @@
+{-# LANGUAGE Unsafe #-}
 {-# LANGUAGE CPP, NoImplicitPrelude, MagicHash #-}
 module Data.Typeable.Internal (
     Typeable(typeOf),

Debug/Trace.hs

@@ -1,3 +1,4 @@
+{-# LANGUAGE Unsafe #-}
 {-# LANGUAGE CPP, ForeignFunctionInterface #-}
 
 -----------------------------------------------------------------------------

Foreign.hs

@@ -1,5 +1,7 @@
 #if sh_SAFE_DEFAULT
 {-# LANGUAGE Trustworthy #-}
+#else
+{-# LANGUAGE Unsafe #-}
 #endif
 {-# LANGUAGE NoImplicitPrelude #-}
 

Foreign/ForeignPtr.hs

@@ -1,6 +1,8 @@
-{-# LANGUAGE SafeImports, CPP, NoImplicitPrelude #-}
+{-# LANGUAGE CPP, NoImplicitPrelude #-}
 #if sh_SAFE_DEFAULT
 {-# LANGUAGE Trustworthy #-}
+#else
+{-# LANGUAGE Unsafe #-}
 #endif
 {-# OPTIONS_HADDOCK hide #-}
 
@@ -28,7 +30,7 @@ module Foreign.ForeignPtr (
 #endif
     ) where
 
-import safe Foreign.ForeignPtr.Safe
+import Foreign.ForeignPtr.Safe
 
 #if !sh_SAFE_DEFAULT
 import Foreign.Ptr ( Ptr )

Foreign/ForeignPtr/Imp.hs

@@ -1,3 +1,4 @@
+{-# LANGUAGE Unsafe #-}
 {-# LANGUAGE CPP, NoImplicitPrelude #-}
 {-# OPTIONS_HADDOCK hide #-}
 

Foreign/ForeignPtr/Unsafe.hs

@@ -1,4 +1,4 @@
-{-# LANGUAGE Trustworthy #-}
+{-# LANGUAGE Unsafe #-}
 {-# LANGUAGE CPP, NoImplicitPrelude #-}
 
 -----------------------------------------------------------------------------

Foreign/Marshal.hs

@@ -1,3 +1,4 @@
+{-# LANGUAGE Unsafe #-}
 {-# LANGUAGE CPP, NoImplicitPrelude #-}
 
 -----------------------------------------------------------------------------

Foreign/Marshal/Unsafe.hs

@@ -1,4 +1,4 @@
-{-# LANGUAGE Trustworthy #-}
+{-# LANGUAGE Unsafe #-}
 {-# LANGUAGE CPP, NoImplicitPrelude #-}
 
 -----------------------------------------------------------------------------

GHC/Arr.lhs

@@ -1,4 +1,5 @@
 \begin{code}
+{-# LANGUAGE Unsafe #-}
 {-# LANGUAGE NoImplicitPrelude, NoBangPatterns, MagicHash, UnboxedTuples #-}
 {-# OPTIONS_GHC -funbox-strict-fields #-}
 {-# OPTIONS_HADDOCK hide #-}

GHC/Base.lhs

@@ -62,6 +62,7 @@ GHC.Float       Classes: Floating, RealFloat
 Other Prelude modules are much easier with fewer complex dependencies.
 
 \begin{code}
+{-# LANGUAGE Unsafe #-}
 {-# LANGUAGE CPP
            , NoImplicitPrelude
            , BangPatterns

GHC/Conc.lhs

@@ -1,4 +1,5 @@
 \begin{code}
+{-# LANGUAGE Unsafe #-}
 {-# LANGUAGE CPP, NoImplicitPrelude #-}
 {-# OPTIONS_GHC -fno-warn-missing-signatures #-}
 {-# OPTIONS_HADDOCK not-home #-}

GHC/Conc/IO.hs

@@ -1,3 +1,4 @@
+{-# LANGUAGE Unsafe #-}
 {-# LANGUAGE CPP
            , NoImplicitPrelude
            , MagicHash

GHC/Conc/Sync.lhs

@@ -1,4 +1,5 @@
 \begin{code}
+{-# LANGUAGE Unsafe #-}
 {-# LANGUAGE CPP
            , NoImplicitPrelude
            , BangPatterns

GHC/Conc/Windows.hs

@@ -1,3 +1,4 @@
+{-# LANGUAGE Unsafe #-}
 {-# LANGUAGE NoImplicitPrelude, MagicHash, UnboxedTuples, ForeignFunctionInterface,
              DeriveDataTypeable #-}
 {-# OPTIONS_GHC -fno-warn-missing-signatures #-}

GHC/Event/Array.hs

@@ -1,3 +1,4 @@
+{-# LANGUAGE Unsafe #-}
 {-# LANGUAGE BangPatterns, CPP, ForeignFunctionInterface, NoImplicitPrelude #-}
 
 module GHC.Event.Array

GHC/Event/Clock.hsc

@@ -1,3 +1,4 @@
+{-# LANGUAGE Unsafe #-}
 {-# LANGUAGE NoImplicitPrelude, BangPatterns, ForeignFunctionInterface #-}
 
 module GHC.Event.Clock (getCurrentTime) where

GHC/Event/Control.hs

@@ -1,3 +1,4 @@
+{-# LANGUAGE Unsafe #-}
 {-# LANGUAGE CPP
            , ForeignFunctionInterface
            , NoImplicitPrelude

GHC/Event/EPoll.hsc

@@ -1,3 +1,4 @@
+{-# LANGUAGE Unsafe #-}
 {-# LANGUAGE CPP
            , ForeignFunctionInterface
            , GeneralizedNewtypeDeriving

GHC/Event/IntMap.hs

@@ -1,3 +1,4 @@
+{-# LANGUAGE Unsafe #-}
 {-# LANGUAGE CPP, MagicHash, NoImplicitPrelude #-}
 
 -----------------------------------------------------------------------------

GHC/Event/Internal.hs

@@ -1,3 +1,4 @@
+{-# LANGUAGE Unsafe #-}
 {-# LANGUAGE ExistentialQuantification, NoImplicitPrelude #-}
 
 module GHC.Event.Internal

GHC/Event/KQueue.hsc

@@ -1,3 +1,4 @@
+{-# LANGUAGE Unsafe #-}
 {-# LANGUAGE CPP
            , ForeignFunctionInterface
            , GeneralizedNewtypeDeriving

GHC/Event/Manager.hs

@@ -1,3 +1,4 @@
+{-# LANGUAGE Unsafe #-}
 {-# LANGUAGE BangPatterns
            , CPP
            , ExistentialQuantification

GHC/Event/PSQ.hs

@@ -1,3 +1,4 @@
+{-# LANGUAGE Unsafe #-}
 {-# LANGUAGE BangPatterns, NoImplicitPrelude #-}
 
 -- Copyright (c) 2008, Ralf Hinze

GHC/Event/Poll.hsc

@@ -1,3 +1,4 @@
+{-# LANGUAGE Unsafe #-}
 {-# LANGUAGE CPP
            , ForeignFunctionInterface
            , GeneralizedNewtypeDeriving

GHC/Event/Thread.hs

@@ -1,3 +1,4 @@
+{-# LANGUAGE Unsafe #-}
 {-# LANGUAGE BangPatterns, ForeignFunctionInterface, NoImplicitPrelude #-}
 
 module GHC.Event.Thread

GHC/Event/Unique.hs

@@ -1,3 +1,4 @@
+{-# LANGUAGE Unsafe #-}
 {-# LANGUAGE BangPatterns, GeneralizedNewtypeDeriving, NoImplicitPrelude #-}
 module GHC.Event.Unique
     (

GHC/Exts.hs

@@ -1,3 +1,4 @@
+{-# LANGUAGE Unsafe #-}
 {-# LANGUAGE MagicHash, UnboxedTuples, DeriveDataTypeable #-}
 
 -----------------------------------------------------------------------------

GHC/Fingerprint.hs

@@ -1,3 +1,4 @@
+{-# LANGUAGE Unsafe #-}
 {-# LANGUAGE NoImplicitPrelude
            , BangPatterns
            , ForeignFunctionInterface

GHC/Fingerprint.hs-boot

@@ -1,3 +1,4 @@
+{-# LANGUAGE Unsafe #-}
 {-# LANGUAGE NoImplicitPrelude #-}
 module GHC.Fingerprint (
         fingerprintString,

GHC/Fingerprint/Type.hs

@@ -1,3 +1,4 @@
+{-# LANGUAGE Trustworthy #-}
 {-# LANGUAGE NoImplicitPrelude #-}
 -- ----------------------------------------------------------------------------
 -- 

GHC/ForeignPtr.hs

@@ -1,3 +1,4 @@
+{-# LANGUAGE Unsafe #-}
 {-# LANGUAGE CPP
            , NoImplicitPrelude
            , BangPatterns

GHC/IO.hs

@@ -1,3 +1,4 @@
+{-# LANGUAGE Unsafe #-}
 {-# LANGUAGE NoImplicitPrelude
            , BangPatterns
            , RankNTypes

GHC/IO.hs-boot

@@ -1,3 +1,4 @@
+{-# LANGUAGE Unsafe #-}
 {-# LANGUAGE NoImplicitPrelude #-}
 
 module GHC.IO where

GHC/IO/FD.hs

@@ -1,3 +1,4 @@
+{-# LANGUAGE Unsafe #-}
 {-# LANGUAGE CPP
            , NoImplicitPrelude
            , BangPatterns

GHC/IOArray.hs

@@ -1,3 +1,4 @@
+{-# LANGUAGE Unsafe #-}
 {-# LANGUAGE NoImplicitPrelude #-}
 {-# OPTIONS_GHC -funbox-strict-fields #-}
 {-# OPTIONS_HADDOCK hide #-}

GHC/IOBase.hs

@@ -1,3 +1,4 @@
+{-# LANGUAGE Unsafe #-}
 {-# LANGUAGE DeriveDataTypeable #-}
 {-# OPTIONS_HADDOCK hide #-}
 

GHC/IORef.hs

@@ -1,3 +1,4 @@
+{-# LANGUAGE Unsafe #-}
 {-# LANGUAGE NoImplicitPrelude, MagicHash #-}
 {-# OPTIONS_GHC -funbox-strict-fields #-}
 {-# OPTIONS_HADDOCK hide #-}

GHC/MVar.hs

@@ -1,3 +1,4 @@
+{-# LANGUAGE Unsafe #-}
 {-# LANGUAGE NoImplicitPrelude, MagicHash, UnboxedTuples #-}
 {-# OPTIONS_GHC -funbox-strict-fields #-}
 {-# OPTIONS_HADDOCK hide #-}

GHC/Pack.lhs

@@ -1,4 +1,5 @@
 \begin{code}
+{-# LANGUAGE Unsafe #-}
 {-# LANGUAGE NoImplicitPrelude, MagicHash, UnboxedTuples #-}
 {-# OPTIONS_HADDOCK hide #-}
 

GHC/Ptr.lhs

@@ -1,4 +1,5 @@
 \begin{code}
+{-# LANGUAGE Unsafe #-}
 {-# LANGUAGE CPP, NoImplicitPrelude, MagicHash #-}
 {-# OPTIONS_HADDOCK hide #-}
 

GHC/ST.lhs

@@ -1,4 +1,5 @@
 \begin{code}
+{-# LANGUAGE Unsafe #-}
 {-# LANGUAGE NoImplicitPrelude, MagicHash, UnboxedTuples, Rank2Types #-}
 {-# OPTIONS_HADDOCK hide #-}
 -----------------------------------------------------------------------------

GHC/STRef.lhs

@@ -1,4 +1,5 @@
 \begin{code}
+{-# LANGUAGE Unsafe #-}
 {-# LANGUAGE NoImplicitPrelude, MagicHash, UnboxedTuples #-}
 {-# OPTIONS_HADDOCK hide #-}
 

GHC/Stable.lhs

@@ -1,4 +1,5 @@
 \begin{code}
+{-# LANGUAGE Unsafe #-}
 {-# LANGUAGE NoImplicitPrelude
            , MagicHash
            , UnboxedTuples

GHC/Stats.hsc

@@ -1,3 +1,4 @@
+{-# LANGUAGE Safe #-}
 {-# LANGUAGE CPP #-}
 {-# LANGUAGE ForeignFunctionInterface #-}
 {-# LANGUAGE RecordWildCards #-}

GHC/Weak.lhs

@@ -1,4 +1,5 @@
 \begin{code}
+{-# LANGUAGE Unsafe #-}
 {-# LANGUAGE CPP
            , NoImplicitPrelude
            , BangPatterns

System/IO/Unsafe.hs

@@ -1,3 +1,4 @@
+{-# LANGUAGE Unsafe #-}
 {-# LANGUAGE CPP, NoImplicitPrelude #-}
 
 -----------------------------------------------------------------------------

Unsafe/Coerce.hs

@@ -1,3 +1,4 @@
+{-# LANGUAGE Unsafe #-}
 {-# LANGUAGE CPP, NoImplicitPrelude, MagicHash #-}
 
 -----------------------------------------------------------------------------