[commit: ghc] master: Reorganise GHC packages, get rid of Builder import cycle (#662) (0106f20)

[git at git.haskell.org]

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

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/0106f203927187d76ce9e92e69ed9864d01091dc/ghc

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

commit 0106f203927187d76ce9e92e69ed9864d01091dc
Author: Andrey Mokhov <andrey.mokhov at gmail.com>
Date:   Mon Aug 27 21:45:17 2018 +0100

    Reorganise GHC packages, get rid of Builder import cycle (#662)
    
    * Reorganise GHC and GHC.Packages modules to get rid of import cycles
    * Move "GHC.Packages" to "Packages", merge "GHC" into "Settings.Default"


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

0106f203927187d76ce9e92e69ed9864d01091dc
 hadrian.cabal                      |   3 +-
 src/Builder.hs                     |   2 +-
 src/Builder.hs-boot                |  46 --------
 src/Expression.hs                  |   2 +-
 src/Expression/Type.hs             |   2 +-
 src/GHC.hs                         | 192 ---------------------------------
 src/GHC/Packages.hs                | 108 -------------------
 src/Hadrian/Haskell/Cabal/Parse.hs |  12 +--
 src/Oracles/ModuleFiles.hs         |   5 +-
 src/Packages.hs                    | 210 +++++++++++++++++++++++++++++++++++++
 src/Rules.hs                       |   2 +-
 src/Rules/BinaryDist.hs            |   2 +-
 src/Rules/Configure.hs             |   6 +-
 src/Rules/Documentation.hs         |   2 +-
 src/Rules/Generate.hs              |   2 +-
 src/Rules/Gmp.hs                   |   2 +-
 src/Rules/Libffi.hs                |   3 +-
 src/Rules/Library.hs               |   9 +-
 src/Rules/Nofib.hs                 |  87 ++++++++-------
 src/Rules/Program.hs               |   3 +-
 src/Rules/Register.hs              |  12 +--
 src/Rules/Selftest.hs              |   4 +-
 src/Rules/Test.hs                  | 105 +++++++------------
 src/Settings.hs                    |   2 +-
 src/Settings/Builders/Cabal.hs     |   8 +-
 src/Settings/Builders/Common.hs    |   5 +-
 src/Settings/Builders/Configure.hs |   2 +-
 src/Settings/Builders/Ghc.hs       |   8 +-
 src/Settings/Builders/HsCpp.hs     |   2 +-
 src/Settings/Builders/Hsc2Hs.hs    |   6 +-
 src/Settings/Builders/Make.hs      |   2 +-
 src/Settings/Builders/RunTest.hs   |  43 ++++++--
 src/Settings/Default.hs            | 163 ++++++++++++++++++++++------
 src/Settings/Packages.hs           |   2 +-
 src/Settings/Warnings.hs           |   2 +-
 35 files changed, 514 insertions(+), 552 deletions(-)

Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc 0106f203927187d76ce9e92e69ed9864d01091dc