[commit: packages/Cabal] ghc-head: 80-col violations. (15af3b7)
git at git.haskell.org
git at git.haskell.org
Mon Aug 26 23:30:27 CEST 2013
Repository : ssh://git@git.haskell.org/Cabal
On branch : ghc-head
Link : http://git.haskell.org/?p=packages/Cabal.git;a=commit;h=15af3b79b2de0bde6fd125c79eb32cae091a96d0
>---------------------------------------------------------------
commit 15af3b79b2de0bde6fd125c79eb32cae091a96d0
Author: Mikhail Glushenkov <mikhail.glushenkov at gmail.com>
Date: Fri Aug 23 05:24:55 2013 +0200
80-col violations.
>---------------------------------------------------------------
15af3b79b2de0bde6fd125c79eb32cae091a96d0
Cabal/Distribution/Simple/Program/Run.hs | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/Cabal/Distribution/Simple/Program/Run.hs b/Cabal/Distribution/Simple/Program/Run.hs
index 21065f9..6229bab 100644
--- a/Cabal/Distribution/Simple/Program/Run.hs
+++ b/Cabal/Distribution/Simple/Program/Run.hs
@@ -137,7 +137,8 @@ runProgramInvocation verbosity
where
input = case encoding of
IOEncodingText -> (inputStr, False)
- IOEncodingUTF8 -> (toUTF8 inputStr, True) -- use binary mode for utf8
+ IOEncodingUTF8 -> (toUTF8 inputStr, True) -- use binary mode for
+ -- utf8
getProgramInvocationOutput :: Verbosity -> ProgramInvocation -> IO String
@@ -173,7 +174,8 @@ getProgramInvocationOutput verbosity
-- | Return the current environment extended with the given overrides.
--
-getEffectiveEnvironment :: [(String, Maybe String)] -> IO (Maybe [(String, String)])
+getEffectiveEnvironment :: [(String, Maybe String)]
+ -> IO (Maybe [(String, String)])
getEffectiveEnvironment [] = return Nothing
getEffectiveEnvironment overrides =
fmap (Just . Map.toList . apply overrides . Map.fromList) getEnvironment
More information about the ghc-commits
mailing list