[commit: ghc] wip/nfs-locking: Rename runHaskell wrapper to runGhc for consistency (c4e2e45)

[git at git.haskell.org]

Repository : ssh://git@git.haskell.org/ghc

On branch  : wip/nfs-locking
Link       : http://ghc.haskell.org/trac/ghc/changeset/c4e2e45be2e11e5785b033ab10511455c2dd00fc/ghc

>---------------------------------------------------------------

commit c4e2e45be2e11e5785b033ab10511455c2dd00fc
Author: Andrey Mokhov <andrey.mokhov at gmail.com>
Date:   Thu Apr 27 21:39:41 2017 +0100

    Rename runHaskell wrapper to runGhc for consistency
    
    See #305


>---------------------------------------------------------------

c4e2e45be2e11e5785b033ab10511455c2dd00fc
 hadrian.cabal                                   | 1 +
 src/Rules/Program.hs                            | 4 ++--
 src/Rules/Wrappers/{Runhaskell.hs => RunGhc.hs} | 8 ++++----
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/hadrian.cabal b/hadrian.cabal
index fd6c036..15c3a2b 100644
--- a/hadrian.cabal
+++ b/hadrian.cabal
@@ -66,6 +66,7 @@ executable hadrian
                        , Rules.Test
                        , Rules.Wrappers.Ghc
                        , Rules.Wrappers.GhcPkg
+                       , Rules.Wrappers.RunGhc
                        , Settings
                        , Settings.Builders.Alex
                        , Settings.Builders.Ar
diff --git a/src/Rules/Program.hs b/src/Rules/Program.hs
index 71fb8b7..62d4b24 100644
--- a/src/Rules/Program.hs
+++ b/src/Rules/Program.hs
@@ -12,7 +12,7 @@ import Oracles.ModuleFiles
 import Oracles.PackageData
 import Rules.Wrappers.Ghc
 import Rules.Wrappers.GhcPkg
-import Rules.Wrappers.Runhaskell
+import Rules.Wrappers.RunGhc
 import Settings
 import Settings.Path
 import Target
@@ -26,7 +26,7 @@ type Wrapper = FilePath -> Expr String
 wrappers :: [(Context, Wrapper)]
 wrappers = [ (vanillaContext Stage0 ghc   , ghcWrapper   )
            , (vanillaContext Stage1 ghc   , ghcWrapper   )
-           , (vanillaContext Stage1 runGhc, runhaskellWrapper)
+           , (vanillaContext Stage1 runGhc, runGhcWrapper)
            , (vanillaContext Stage0 ghcPkg, ghcPkgWrapper) ]
 
 buildProgram :: [(Resource, Int)] -> Context -> Rules ()
diff --git a/src/Rules/Wrappers/Runhaskell.hs b/src/Rules/Wrappers/RunGhc.hs
similarity index 59%
rename from src/Rules/Wrappers/Runhaskell.hs
rename to src/Rules/Wrappers/RunGhc.hs
index 521b41a..95b5700 100644
--- a/src/Rules/Wrappers/Runhaskell.hs
+++ b/src/Rules/Wrappers/RunGhc.hs
@@ -1,12 +1,12 @@
-module Rules.Wrappers.Runhaskell (runhaskellWrapper) where
+module Rules.Wrappers.RunGhc (runGhcWrapper) where
 
 import Base
 import Expression
 import Oracles.Path
 
-runhaskellWrapper :: FilePath -> Expr String
-runhaskellWrapper program = do
-    lift $ need [sourcePath -/- "Rules/Wrappers/Runhaskell.hs"]
+runGhcWrapper :: FilePath -> Expr String
+runGhcWrapper program = do
+    lift $ need [sourcePath -/- "Rules/Wrappers/RunGhc.hs"]
     top <- getTopDirectory
     return $ unlines
         [ "#!/bin/bash"