diff options
author | Sven Tennie <sven.tennie@gmail.com> | 2021-09-23 11:44:52 +0200 |
---|---|---|
committer | Sven Tennie <sven.tennie@gmail.com> | 2021-09-23 11:44:52 +0200 |
commit | 6a15425cc769032ad30adc3122c6e356a5e2e764 (patch) | |
tree | dc95a14204f5421feaf16dfb3f289b22a5b39406 /libraries/base | |
parent | b3ab7a1c9ffeb2808a7930e7bb0910a96454837f (diff) | |
download | haskell-wip/T18159.tar.gz |
Minimize diffwip/T18159
Diffstat (limited to 'libraries/base')
-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 |
3 files changed, 3 insertions, 3 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 = |