[commit: ghc] wip/nfs-locking: Merge pull request #144 from ndmitchell/master (ef27c7c)

[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/ef27c7c14f589fdd585c8c9bb2d6264db92a73d0/ghc

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

commit ef27c7c14f589fdd585c8c9bb2d6264db92a73d0
Merge: a850455 4be2130
Author: Andrey Mokhov <andrey.mokhov at gmail.com>
Date:   Sun Jan 10 22:54:19 2016 +0000

    Merge pull request #144 from ndmitchell/master
    
    General refactorings



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

ef27c7c14f589fdd585c8c9bb2d6264db92a73d0
 .ghci                       | 2 ++
 build.bat                   | 2 ++
 src/Base.hs                 | 8 +++++---
 src/Expression.hs           | 4 ++--
 src/Oracles/LookupInPath.hs | 1 -
 src/Rules.hs                | 3 +--
 src/Rules/Actions.hs        | 7 +++----
 src/Rules/Data.hs           | 1 -
 src/Rules/Libffi.hs         | 1 -
 src/Way.hs                  | 2 +-
 10 files changed, 16 insertions(+), 15 deletions(-)

diff --cc src/Rules/Data.hs
index 5cd2e50,99334f4..fbe22db
--- a/src/Rules/Data.hs
+++ b/src/Rules/Data.hs
@@@ -1,10 -1,7 +1,9 @@@
  module Rules.Data (buildPackageData) where
  
 +import qualified System.Directory as IO
 +
  import Base
  import Expression
- import Extra (replace)
  import GHC
  import Oracles
  import Predicates (registerPackage)