Update Control.Monad.ST.* for Safe Haskell as now they're safe by default

6 files changed, 9 insertions, 7 deletions

diff --git a/libraries/base/Control/Monad/ST.hs b/libraries/base/Control/Monad/ST.hs
index 0d2f58b16b..8313c2d3eb 100644
--- a/libraries/base/Control/Monad/ST.hs
+++ b/libraries/base/Control/Monad/ST.hs
@@ -1,4 +1,4 @@
-{-# LANGUAGE Unsafe #-}
+{-# LANGUAGE Trustworthy #-}
 
 -----------------------------------------------------------------------------
 -- |
@@ -31,5 +31,5 @@ module Control.Monad.ST (
         stToIO,
     ) where
 
-import Control.Monad.ST.Safe
+import Control.Monad.ST.Imp
 
diff --git a/libraries/base/Control/Monad/ST/Lazy.hs b/libraries/base/Control/Monad/ST/Lazy.hs
index c21272812d..ef2e648629 100644
--- a/libraries/base/Control/Monad/ST/Lazy.hs
+++ b/libraries/base/Control/Monad/ST/Lazy.hs
@@ -1,4 +1,4 @@
-{-# LANGUAGE Unsafe #-}
+{-# LANGUAGE Trustworthy #-}
 
 -----------------------------------------------------------------------------
 -- |
@@ -30,5 +30,5 @@ module Control.Monad.ST.Lazy (
         stToIO,
     ) where
 
-import Control.Monad.ST.Lazy.Safe
+import Control.Monad.ST.Lazy.Imp
 
diff --git a/libraries/base/Control/Monad/ST/Lazy/Imp.hs b/libraries/base/Control/Monad/ST/Lazy/Imp.hs
index 80c9fa5af3..55b28cfc9a 100644
--- a/libraries/base/Control/Monad/ST/Lazy/Imp.hs
+++ b/libraries/base/Control/Monad/ST/Lazy/Imp.hs
@@ -38,7 +38,7 @@ module Control.Monad.ST.Lazy.Imp (
 
 import Control.Monad.Fix
 
-import qualified Control.Monad.ST.Safe as ST
+import qualified Control.Monad.ST as ST
 import qualified Control.Monad.ST.Unsafe as ST
 
 import qualified GHC.ST as GHC.ST
diff --git a/libraries/base/Control/Monad/ST/Lazy/Safe.hs b/libraries/base/Control/Monad/ST/Lazy/Safe.hs
index 387313f287..9f8e60686f 100644
--- a/libraries/base/Control/Monad/ST/Lazy/Safe.hs
+++ b/libraries/base/Control/Monad/ST/Lazy/Safe.hs
@@ -18,7 +18,7 @@
 --
 -----------------------------------------------------------------------------
 
-module Control.Monad.ST.Lazy.Safe (
+module Control.Monad.ST.Lazy.Safe {-# DEPRECATED "Safe is now the default, please use Control.Monad.ST.Lazy instead" #-} (
         -- * The 'ST' monad
         ST,
         runST,
diff --git a/libraries/base/Control/Monad/ST/Safe.hs b/libraries/base/Control/Monad/ST/Safe.hs
index 1e9c981895..d1008325d2 100644
--- a/libraries/base/Control/Monad/ST/Safe.hs
+++ b/libraries/base/Control/Monad/ST/Safe.hs
@@ -18,7 +18,7 @@
 --
 -----------------------------------------------------------------------------
 
-module Control.Monad.ST.Safe (
+module Control.Monad.ST.Safe {-# DEPRECATED "Safe is now the default, please use Control.Monad.ST instead" #-} (
         -- * The 'ST' Monad
         ST,             -- abstract
         runST,
diff --git a/libraries/base/Control/Monad/ST/Strict.hs b/libraries/base/Control/Monad/ST/Strict.hs
index 4e474d95ae..c858548c99 100644
--- a/libraries/base/Control/Monad/ST/Strict.hs
+++ b/libraries/base/Control/Monad/ST/Strict.hs
@@ -1,3 +1,5 @@
+{-# LANGUAGE Safe #-}
+
 -----------------------------------------------------------------------------
 -- |
 -- Module      :  Control.Monad.ST.Strict