[commit: ghc] wip/nfs-locking: Don't conflict with parallel in the latest Shake, provides a warning free way to be forward and backward compatible with Shake (albeit not pretty) (8efb43d)

[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/8efb43dd384111a0f724924507aac59a655b382d/ghc

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

commit 8efb43dd384111a0f724924507aac59a655b382d
Author: Neil Mitchell <ndmitchell at gmail.com>
Date:   Sat Jan 9 21:33:02 2016 +0000

    Don't conflict with parallel in the latest Shake, provides a warning free way to be forward and backward compatible with Shake (albeit not pretty)


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

8efb43dd384111a0f724924507aac59a655b382d
 src/GHC.hs | 4 ++--
 src/Way.hs | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/GHC.hs b/src/GHC.hs
index f967263..1574ec3 100644
--- a/src/GHC.hs
+++ b/src/GHC.hs
@@ -4,7 +4,7 @@ module GHC (
     deepseq, deriveConstants, directory, dllSplit, filepath, genapply,
     genprimopcode, ghc, ghcBoot, ghcCabal, ghci, ghcPkg, ghcPrim, ghcTags,
     ghcSplit, haddock, haskeline, hsc2hs, hoopl, hp2ps, hpc, hpcBin, integerGmp,
-    integerSimple, iservBin, libffi, mkUserGuidePart, parallel, pretty,
+    integerSimple, iservBin, libffi, mkUserGuidePart, GHC.parallel, pretty,
     primitive, process, rts, runGhc, stm, templateHaskell, terminfo, time,
     touchy, transformers, unlit, unix, win32, xhtml,
 
@@ -26,7 +26,7 @@ defaultKnownPackages =
     , deepseq, deriveConstants, directory, dllSplit, filepath, genapply
     , genprimopcode, ghc, ghcBoot, ghcCabal, ghci, ghcPkg, ghcPrim
     , ghcTags, haddock, haskeline, hsc2hs, hoopl, hp2ps, hpc, hpcBin, integerGmp
-    , integerSimple, iservBin, libffi, mkUserGuidePart, parallel, pretty
+    , integerSimple, iservBin, libffi, mkUserGuidePart, GHC.parallel, pretty
     , primitive, process, rts, runGhc, stm, templateHaskell, terminfo, time
     , touchy, transformers, unlit, unix, win32, xhtml ]
 
diff --git a/src/Way.hs b/src/Way.hs
index 3b1f6c0..94a3bcc 100644
--- a/src/Way.hs
+++ b/src/Way.hs
@@ -1,7 +1,7 @@
 module Way (
     WayUnit (..), Way, wayUnit,
 
-    vanilla, profiling, logging, parallel, granSim,
+    vanilla, profiling, logging, Way.parallel, granSim,
     threaded, threadedProfiling, threadedLogging,
     debug, debugProfiling, threadedDebug, threadedDebugProfiling,
     dynamic, profilingDynamic, threadedProfilingDynamic,