Repository : ssh://darcs.haskell.org//srv/darcs/packages/haskeline On branch : master
http://hackage.haskell.org/trac/ghc/changeset/cfd0a05d053cad6417264f22c10540dc4c7446bd >--------------------------------------------------------------- commit cfd0a05d053cad6417264f22c10540dc4c7446bd Author: Judah Jacobson <[email protected]> Date: Sun Feb 19 23:40:25 2012 +0000 Don't use the extensible-exceptions package. This bumps up haskeline's requirements to ghc-6.10.1 or later. >--------------------------------------------------------------- System/Console/Haskeline/Backend/Terminfo.hs | 2 +- System/Console/Haskeline/Directory.hsc | 2 +- System/Console/Haskeline/History.hs | 2 +- System/Console/Haskeline/MonadException.hs | 6 +++--- System/Console/Haskeline/Term.hs | 2 +- haskeline.cabal | 3 +-- 6 files changed, 8 insertions(+), 9 deletions(-) diff --git a/System/Console/Haskeline/Backend/Terminfo.hs b/System/Console/Haskeline/Backend/Terminfo.hs index 20eeac3..ed6ef02 100644 --- a/System/Console/Haskeline/Backend/Terminfo.hs +++ b/System/Console/Haskeline/Backend/Terminfo.hs @@ -8,7 +8,7 @@ import System.Console.Terminfo import Control.Monad import Data.List(intersperse, foldl') import System.IO -import qualified Control.Exception.Extensible as Exception +import qualified Control.Exception as Exception import qualified Data.ByteString.Char8 as B import Data.Maybe (fromMaybe, mapMaybe) import Control.Concurrent.Chan diff --git a/System/Console/Haskeline/Directory.hsc b/System/Console/Haskeline/Directory.hsc index 4666ee4..c3fd00f 100644 --- a/System/Console/Haskeline/Directory.hsc +++ b/System/Console/Haskeline/Directory.hsc @@ -83,7 +83,7 @@ import System.Directory import Data.ByteString.Char8 (pack, unpack) import qualified System.Directory as D -import Control.Exception.Extensible +import Control.Exception import System.Console.Haskeline.Backend.IConv getDirectoryContents :: FilePath -> IO [FilePath] diff --git a/System/Console/Haskeline/History.hs b/System/Console/Haskeline/History.hs index 56aa797..9fe2d12 100644 --- a/System/Console/Haskeline/History.hs +++ b/System/Console/Haskeline/History.hs @@ -30,7 +30,7 @@ import Data.Foldable (toList) import qualified Data.ByteString as B import qualified Data.ByteString.UTF8 as UTF8 -import Control.Exception.Extensible +import Control.Exception import System.Directory(doesFileExist) diff --git a/System/Console/Haskeline/MonadException.hs b/System/Console/Haskeline/MonadException.hs index 6b66b0a..787364c 100644 --- a/System/Console/Haskeline/MonadException.hs +++ b/System/Console/Haskeline/MonadException.hs @@ -1,4 +1,4 @@ -{- | This module redefines some of the functions in "Control.Exception.Extensible" to +{- | This module redefines some of the functions in "Control.Exception" to work for more general monads than only 'IO'. -} @@ -16,8 +16,8 @@ module System.Console.Haskeline.MonadException( E.IOException()) where -import qualified Control.Exception.Extensible as E -import Control.Exception.Extensible(Exception,SomeException) +import qualified Control.Exception as E +import Control.Exception (Exception,SomeException) import Prelude hiding (catch) import Control.Monad.Reader import Control.Monad.State diff --git a/System/Console/Haskeline/Term.hs b/System/Console/Haskeline/Term.hs index 3ba6ef5..796bb12 100644 --- a/System/Console/Haskeline/Term.hs +++ b/System/Console/Haskeline/Term.hs @@ -11,7 +11,7 @@ import Data.Typeable import Data.ByteString.Char8 (ByteString) import qualified Data.ByteString.Char8 as B import Data.Word -import Control.Exception.Extensible (fromException, AsyncException(..),bracket_) +import Control.Exception (fromException, AsyncException(..),bracket_) import System.IO import Control.Monad(liftM,when,guard) import System.IO.Error (isEOFError) diff --git a/haskeline.cabal b/haskeline.cabal index e44f42a..b4d4581 100644 --- a/haskeline.cabal +++ b/haskeline.cabal @@ -59,8 +59,7 @@ Library } } Build-depends: filepath >= 1.1 && < 1.4, mtl >= 1.1 && < 2.1, - utf8-string==0.3.* && >=0.3.6, - extensible-exceptions==0.1.* && >=0.1.1.0 + utf8-string==0.3.* && >=0.3.6 Extensions: ForeignFunctionInterface, Rank2Types, FlexibleInstances, TypeSynonymInstances FlexibleContexts, ExistentialQuantification _______________________________________________ Cvs-libraries mailing list [email protected] http://www.haskell.org/mailman/listinfo/cvs-libraries
