Revert "remove old fail compatibility imports that are obsolete ?"

They are needed with ghc <8.4, not for fail but for <> I think.
Try cleaning up again another time.
This reverts commit 318ce7eb07.
This commit is contained in:
Simon Michael 2019-12-01 09:31:36 -08:00
parent d922b6e798
commit a0b92e02b9
5 changed files with 10 additions and 0 deletions

View File

@ -75,6 +75,8 @@ module Hledger.Data.Dates (
)
where
import Prelude ()
import "base-compat-batteries" Prelude.Compat hiding (fail)
import qualified "base-compat-batteries" Control.Monad.Fail.Compat as Fail (MonadFail, fail)
import Control.Applicative.Permutations
import Control.Monad (unless)

View File

@ -100,6 +100,8 @@ module Hledger.Read.Common (
)
where
--- * imports
import Prelude ()
import "base-compat-batteries" Prelude.Compat hiding (fail, readFile)
import qualified "base-compat-batteries" Control.Monad.Fail.Compat as Fail (fail)
import Control.Monad.Except (ExceptT(..), runExceptT, throwError)
import Control.Monad.State.Strict hiding (fail)

View File

@ -30,6 +30,8 @@ module Hledger.Read.CsvReader (
tests_CsvReader,
)
where
import Prelude ()
import "base-compat-batteries" Prelude.Compat hiding (fail)
import qualified "base-compat-batteries" Control.Monad.Fail.Compat as Fail (fail)
import Control.Exception (IOException, handle, throw)
import Control.Monad (liftM, unless, when)

View File

@ -63,6 +63,8 @@ module Hledger.Read.JournalReader (
)
where
--- * imports
-- import qualified Prelude (fail)
-- import "base-compat-batteries" Prelude.Compat hiding (fail, readFile)
import qualified "base-compat-batteries" Control.Monad.Fail.Compat as Fail (fail)
import qualified Control.Exception as C
import Control.Monad (forM_, when, void)

View File

@ -15,6 +15,8 @@ module Hledger.Cli.Commands.Add (
)
where
import Prelude ()
import "base-compat-batteries" Prelude.Compat hiding (fail)
import Control.Exception as E
import Control.Monad (when)
import Control.Monad.Trans.Class