summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
2b538bf)
Alter the order of the argument to annotateIOError to match mkIOError
and the FFI spec.
mkIOError, -- :: IOErrorType -> String -> Maybe Handle
-- -> Maybe FilePath -> IOError
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
#endif
alreadyExistsErrorType, -- :: IOErrorType
annotateIOError :: IOError
-> String
annotateIOError :: IOError
-> String
-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
IOError (hdl `mplus` ohdl) errTy loc str (path `mplus` opath)
where
Nothing `mplus` ys = ys