diff --git a/cabal-install/Distribution/Client/HttpUtils.hs b/cabal-install/Distribution/Client/HttpUtils.hs index 64e57656f1d..d6e5270732d 100644 --- a/cabal-install/Distribution/Client/HttpUtils.hs +++ b/cabal-install/Distribution/Client/HttpUtils.hs @@ -32,7 +32,7 @@ import System.Win32.Registry , regQueryValue, regQueryValueEx ) import Control.Exception ( bracket ) -import Distribution.Compat.Exception +import Distribution.Compat.ExceptionCI ( handleIO ) import Foreign ( toBool, Storable(peek, sizeOf), castPtr, alloca ) diff --git a/cabal-install/Distribution/Client/Install.hs b/cabal-install/Distribution/Client/Install.hs index 0527709cfb3..764e0faa44b 100644 --- a/cabal-install/Distribution/Client/Install.hs +++ b/cabal-install/Distribution/Client/Install.hs @@ -33,7 +33,7 @@ import System.Exit import Control.Exception as Exception ( Exception(IOException, ExitException) ) #endif -import Distribution.Compat.Exception +import Distribution.Compat.ExceptionCI ( SomeException, catchIO, catchExit ) import Control.Monad ( when, unless ) diff --git a/cabal-install/Distribution/Client/Types.hs b/cabal-install/Distribution/Client/Types.hs index 4f0376d8210..20f70c83ee6 100644 --- a/cabal-install/Distribution/Client/Types.hs +++ b/cabal-install/Distribution/Client/Types.hs @@ -29,7 +29,7 @@ import Distribution.Version import Data.Map (Map) import Network.URI (URI) -import Distribution.Compat.Exception +import Distribution.Compat.ExceptionCI ( SomeException ) newtype Username = Username { unUsername :: String } diff --git a/cabal-install/Distribution/Compat/Exception.hs b/cabal-install/Distribution/Compat/ExceptionCI.hs similarity index 97% rename from cabal-install/Distribution/Compat/Exception.hs rename to cabal-install/Distribution/Compat/ExceptionCI.hs index 2baafb5015e..5ee8c8f59d9 100644 --- a/cabal-install/Distribution/Compat/Exception.hs +++ b/cabal-install/Distribution/Compat/ExceptionCI.hs @@ -3,7 +3,7 @@ {-# OPTIONS_NHC98 -cpp #-} {-# OPTIONS_JHC -fcpp #-} -- #hide -module Distribution.Compat.Exception ( +module Distribution.Compat.ExceptionCI ( SomeException, onException, catchIO,