diff options
Diffstat (limited to 'libraries')
| -rw-r--r-- | libraries/base/Control/Exception/Base.hs | 2 | ||||
| -rw-r--r-- | libraries/base/GHC/IO.hs | 2 | ||||
| -rw-r--r-- | libraries/base/GHC/IO/Handle.hs | 2 | ||||
| -rw-r--r-- | libraries/ghci/GHCi/Run.hs | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/libraries/base/Control/Exception/Base.hs b/libraries/base/Control/Exception/Base.hs index a90815d28f..c25caea7dc 100644 --- a/libraries/base/Control/Exception/Base.hs +++ b/libraries/base/Control/Exception/Base.hs @@ -191,7 +191,7 @@ tryJust p a = do -- exception raised by the computation. onException :: IO a -> IO b -> IO a onException io what = io `catch` \e -> do _ <- what - throwIO (e :: SomeExceptionWithLocation) + throwIO (e :: SomeException) ----------------------------------------------------------------------------- -- Some Useful Functions diff --git a/libraries/base/GHC/IO.hs b/libraries/base/GHC/IO.hs index 6c5a208338..7332e119b5 100644 --- a/libraries/base/GHC/IO.hs +++ b/libraries/base/GHC/IO.hs @@ -298,7 +298,7 @@ getMaskingState = IO $ \s -> onException :: IO a -> IO b -> IO a onException io what = io `catchException` \e -> do _ <- what - throwIO (e :: SomeExceptionWithLocation) + throwIO (e :: SomeException) -- | Executes an IO computation with asynchronous -- exceptions /masked/. That is, any thread which attempts to raise diff --git a/libraries/base/GHC/IO/Handle.hs b/libraries/base/GHC/IO/Handle.hs index 690b971c04..3efe254839 100644 --- a/libraries/base/GHC/IO/Handle.hs +++ b/libraries/base/GHC/IO/Handle.hs @@ -701,7 +701,7 @@ hDuplicateTo h1 _ = ioe_dupHandlesNotCompatible h1 try :: IO () -> IO () -try io = io `catchException` (const (pure ()) :: SomeExceptionWithLocation -> IO ()) +try io = io `catchException` (const (pure ()) :: SomeException -> IO ()) ioe_dupHandlesNotCompatible :: Handle -> IO a ioe_dupHandlesNotCompatible h = diff --git a/libraries/ghci/GHCi/Run.hs b/libraries/ghci/GHCi/Run.hs index ad062672e0..4ecb64620a 100644 --- a/libraries/ghci/GHCi/Run.hs +++ b/libraries/ghci/GHCi/Run.hs @@ -246,7 +246,7 @@ redirectInterrupts target wait = do m <- deRefWeak wtid case m of Nothing -> wait - Just target -> do throwTo target (e :: SomeExceptionWithLocation); wait + Just target -> do throwTo target (e :: SomeException); wait measureAlloc :: IO (EvalResult a) -> IO (EvalStatus a) measureAlloc io = do |