From: simonmar Date: Wed, 8 Jan 2003 13:06:30 +0000 (+0000) Subject: [project @ 2003-01-08 13:06:30 by simonmar] X-Git-Tag: nhc98-1-18-release~764 X-Git-Url: http://git.megacz.com/?a=commitdiff_plain;h=ba0995e9c3b14c7ec456976a2bf91abd19917d57;hp=2b538bf568ecacd40514cabe567508cde14d3886;p=ghc-base.git [project @ 2003-01-08 13:06:30 by simonmar] Alter the order of the argument to annotateIOError to match mkIOError and the FFI spec. --- diff --git a/System/IO/Error.hs b/System/IO/Error.hs index cff0194..c42704b 100644 --- a/System/IO/Error.hs +++ b/System/IO/Error.hs @@ -28,8 +28,8 @@ module System.IO.Error ( mkIOError, -- :: IOErrorType -> String -> Maybe Handle -- -> Maybe FilePath -> IOError - annotateIOError, -- :: IOError -> String -> Maybe FilePath - -- -> Maybe Handle -> IOError + annotateIOError, -- :: IOError -> String -> Maybe Handle + -- -> Maybe FilePath -> IOError #endif alreadyExistsErrorType, -- :: IOErrorType @@ -240,10 +240,10 @@ ioeGetFileName ioe = ioe_filename ioe annotateIOError :: IOError -> String - -> Maybe FilePath -> Maybe Handle + -> Maybe FilePath -> IOError -annotateIOError (IOError hdl errTy _ str path) loc opath ohdl = +annotateIOError (IOError hdl errTy _ str path) loc ohdl opath = IOError (hdl `mplus` ohdl) errTy loc str (path `mplus` opath) where Nothing `mplus` ys = ys