Merge pull request #263 from slotThe/exception-extensible

Control.Exception.Extensible -> Control.Exception

src/XMonad/Core.hs

@@ -35,8 +35,8 @@ module XMonad.Core (
 import XMonad.StackSet hiding (modify)
 
 import Prelude
-import Control.Exception.Extensible (fromException, try, bracket, throw, finally, SomeException(..))
-import qualified Control.Exception.Extensible as E
+import Control.Exception (fromException, try, bracket, throw, finally, SomeException(..))
+import qualified Control.Exception as E
 import Control.Applicative ((<|>), empty)
 import Control.Monad.Fail
 import Control.Monad.State

src/XMonad/Main.hs

@@ -16,7 +16,7 @@
 module XMonad.Main (xmonad, launch) where
 
 import System.Locale.SetLocale
-import qualified Control.Exception.Extensible as E
+import qualified Control.Exception as E
 import Data.Bits
 import Data.List ((\\))
 import Data.Function

src/XMonad/ManageHook.hs

@@ -21,8 +21,8 @@ module XMonad.ManageHook where
 import XMonad.Core
 import Graphics.X11.Xlib.Extras
 import Graphics.X11.Xlib (Display, Window, internAtom, wM_NAME)
-import Control.Exception.Extensible (bracket, SomeException(..))
-import qualified Control.Exception.Extensible as E
+import Control.Exception (bracket, SomeException(..))
+import qualified Control.Exception as E
 import Control.Monad.Reader
 import Data.Maybe
 import Data.Monoid

src/XMonad/Operations.hs

@@ -32,7 +32,7 @@ import qualified Data.Set as S
 import Control.Arrow (second)
 import Control.Monad.Reader
 import Control.Monad.State
-import qualified Control.Exception.Extensible as C
+import qualified Control.Exception as C
 
 import System.IO
 import System.Directory

tests/Properties/Failure.hs

@@ -2,7 +2,7 @@ module Properties.Failure where
 
 import XMonad.StackSet hiding (filter)
 
-import qualified Control.Exception.Extensible as C
+import qualified Control.Exception as C
 import System.IO.Unsafe
 import Data.List (isPrefixOf)
 

xmonad.cabal

@@ -77,7 +77,6 @@ library
                  , containers
                  , data-default
                  , directory
-                 , extensible-exceptions
                  , filepath
                  , mtl
                  , process
@@ -132,4 +131,4 @@ test-suite properties
                   Properties.Workspace
                   Utils
   hs-source-dirs: tests
-  build-depends:  base, QuickCheck >= 2, X11, containers, extensible-exceptions, xmonad
+  build-depends:  base, QuickCheck >= 2, X11, containers, xmonad