cabal/cabal-install: renamed D.C.Exception -> D.C.ExceptionCI to avoi…

…d clash with Cabal's one Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
gentoo-haskell · Aug 28, 2012 · 694af36 · 694af36
1 parent 54762ef
commit 694af36
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git 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
@@ -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
@@ -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/...-install/Distribution/Compat/Exception.hs → ...nstall/Distribution/Compat/ExceptionCI.hs b/...-install/Distribution/Compat/Exception.hs → ...nstall/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,