Remove deprecated instance Error (mtl)

Author: andreasabel

Network/HTTP/Base.hs

@@ -107,7 +107,7 @@ import Network.URI
    )
 
 import Control.Monad ( guard )
-import Control.Monad.Error.Class ()
+
 import Data.Bits     ( (.&.), (.|.), shiftL, shiftR )
 import Data.Word     ( Word8 )
 import Data.Char     ( digitToInt, intToDigit, toLower, isDigit,

Network/HTTP/UserAgent.hs

@@ -1,7 +1,5 @@
 module Network.HTTP.UserAgent where
 
-import Control.Monad.Error
-
 import Data.ByteString.Lazy.Char8 ( ByteString )
 import qualified Data.ByteString.Lazy.Char8 as BS
 

Network/Stream.hs

@@ -32,24 +32,18 @@ module Network.Stream
    , failMisc  -- :: String -> Result a
    ) where
 
-import Control.Monad.Error
-
 data ConnError
  = ErrorReset
  | ErrorClosed
  | ErrorParse String
  | ErrorMisc String
    deriving(Show,Eq)
 
-instance Error ConnError where
-  noMsg = strMsg "unknown error"
-  strMsg x = ErrorMisc x
-
 -- in GHC 7.0 the Monad instance for Error no longer
 -- uses fail x = Left (strMsg x). failMisc is therefore
 -- used instead.
 failMisc :: String -> Result a
-failMisc x = failWith (strMsg x)
+failMisc x = failWith (ErrorMisc x)
 
 failParse :: String -> Result a
 failParse x = failWith (ErrorParse x)