[commit: ghc] wip/nfs-locking: Get rid of redError_. (4fd1732)
git at git.haskell.org
git at git.haskell.org
Thu Oct 26 23:32:58 UTC 2017
Repository : ssh://git@git.haskell.org/ghc
On branch : wip/nfs-locking
Link : http://ghc.haskell.org/trac/ghc/changeset/4fd17325b1c7921c1278a8da85544960ef07a5af/ghc
>---------------------------------------------------------------
commit 4fd17325b1c7921c1278a8da85544960ef07a5af
Author: Andrey Mokhov <andrey.mokhov at gmail.com>
Date: Wed Aug 5 23:23:22 2015 +0100
Get rid of redError_.
>---------------------------------------------------------------
4fd17325b1c7921c1278a8da85544960ef07a5af
src/Oracles/Base.hs | 4 ++--
src/Util.hs | 6 +-----
2 files changed, 3 insertions(+), 7 deletions(-)
diff --git a/src/Oracles/Base.hs b/src/Oracles/Base.hs
index 29ec4e4..a6abbfc 100644
--- a/src/Oracles/Base.hs
+++ b/src/Oracles/Base.hs
@@ -31,8 +31,8 @@ configOracle = do
let configFile = configPath -/- "system.config"
cfg <- newCache $ \() -> do
unlessM (doesFileExist $ configFile <.> "in") $
- putError_ $ "\nConfiguration file '" ++ (configFile <.> "in")
- ++ "' is missing; unwilling to proceed."
+ putError $ "\nConfiguration file '" ++ (configFile <.> "in")
+ ++ "' is missing; unwilling to proceed."
need [configFile]
putOracle $ "Reading " ++ configFile ++ "..."
liftIO $ readConfigFile configFile
diff --git a/src/Util.hs b/src/Util.hs
index 32b6478..f00785f 100644
--- a/src/Util.hs
+++ b/src/Util.hs
@@ -4,13 +4,12 @@ module Util (
replaceIf, replaceEq, replaceSeparators,
unifyPath, (-/-),
chunksOfSize,
- putColoured, putOracle, putBuild, putError, putError_,
+ putColoured, putOracle, putBuild, putError,
bimap, minusOrd, intersectOrd
) where
import Base
import Data.Char
-import Control.Monad
import System.IO
import System.Console.ANSI
@@ -70,9 +69,6 @@ putError msg = do
putColoured Red msg
error $ "GHC build system error: " ++ msg
-putError_ :: String -> Action ()
-putError_ = void . putError
-
-- Depending on Data.Bifunctor only for this function seems an overkill
bimap :: (a -> b) -> (c -> d) -> (a, c) -> (b, d)
bimap f g (x, y) = (f x, g y)
More information about the ghc-commits
mailing list