[commit: ghc] master: Revert "Unify hsig and hs-boot; add preliminary "hs-boot" merging." (ac1a379)

[git at git.haskell.org]

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

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

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

commit ac1a379363618a6f2f17fff65ce9129164b6ef30
Author: Edward Z. Yang <ezyang at cs.stanford.edu>
Date:   Fri Nov 13 16:18:24 2015 -0800

    Revert "Unify hsig and hs-boot; add preliminary "hs-boot" merging."
    
    Summary:
    This reverts commit 06d46b1e4507e09eb2a7a04998a92610c8dc6277.
    
    This also has a Haddock submodule update.
    
    Test Plan: validate
    
    Reviewers: simonpj, austin, bgamari
    
    Subscribers: thomie
    
    Differential Revision: https://phabricator.haskell.org/D1475


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

ac1a379363618a6f2f17fff65ce9129164b6ef30
 compiler/deSugar/Desugar.hs                        |   2 +-
 compiler/iface/LoadIface.hs                        |   2 +-
 compiler/iface/MkIface.hs                          |  47 ++--------
 compiler/main/DriverMkDepend.hs                    |   6 +-
 compiler/main/DriverPhases.hs                      |  80 +++++++++-------
 compiler/main/DriverPipeline.hs                    |  83 +++++------------
 compiler/main/Finder.hs                            |   8 +-
 compiler/main/GHC.hs                               |   2 +-
 compiler/main/GhcMake.hs                           | 103 ++++++++-------------
 compiler/main/HscMain.hs                           |  69 +-------------
 compiler/main/HscTypes.hs                          |  40 ++++----
 compiler/typecheck/TcBinds.hs                      |   4 +-
 compiler/typecheck/TcInstDcls.hs                   |   4 +-
 compiler/typecheck/TcRnDriver.hs                   |  43 +++++----
 compiler/typecheck/TcRnMonad.hs                    |   2 +-
 compiler/typecheck/TcRnTypes.hs                    |   1 -
 ghc/Main.hs                                        |  19 +---
 testsuite/.gitignore                               |   1 -
 .../dynamicToo005/{A005.hs-boot => A005.hsig}      |   0
 .../tests/driver/dynamicToo/dynamicToo005/Makefile |   8 +-
 .../dynamicToo/dynamicToo006/{A.hs-boot => A.hsig} |   0
 .../tests/driver/dynamicToo/dynamicToo006/Makefile |   2 -
 testsuite/tests/driver/recomp014/Makefile          |  33 -------
 testsuite/tests/driver/recomp014/all.T             |   4 -
 testsuite/tests/driver/recomp014/recomp014.stdout  |   4 -
 .../tests/driver/sigof01/{B.hs-boot => B.hsig}     |   0
 testsuite/tests/driver/sigof01/Makefile            |   9 +-
 testsuite/tests/driver/sigof01/all.T               |  10 --
 testsuite/tests/driver/sigof01/sigof01i.script     |   1 -
 testsuite/tests/driver/sigof01/sigof01i.stdout     |   3 -
 testsuite/tests/driver/sigof01/sigof01i2.script    |   3 -
 testsuite/tests/driver/sigof01/sigof01i2.stdout    |   9 --
 testsuite/tests/driver/sigof01/sigof01m.stdout     |   7 +-
 testsuite/tests/driver/sigof02/Makefile            |  21 ++---
 .../tests/driver/sigof02/{Map.hs-boot => Map.hsig} |   0
 .../sigof02/{MapAsSet.hs-boot => MapAsSet.hsig}    |   0
 testsuite/tests/driver/sigof02/sigof02dm.stdout    |   8 +-
 testsuite/tests/driver/sigof02/sigof02m.stdout     |  10 +-
 .../driver/sigof03/{ASig1.hs-boot => ASig1.hsig}   |   0
 .../driver/sigof03/{ASig2.hs-boot => ASig2.hsig}   |   0
 testsuite/tests/driver/sigof03/Makefile            |   5 +-
 testsuite/tests/driver/sigof04/Makefile            |   2 +-
 .../tests/driver/sigof04/{Sig.hs-boot => Sig.hsig} |   0
 testsuite/tests/driver/sigof04/sigof04.stderr      |   4 +-
 testsuite/tests/typecheck/should_compile/all.T     |   2 +-
 .../should_compile/{tc264.hs-boot => tc264.hsig}   |   0
 .../tests/typecheck/should_compile/tc264.stderr    |   2 +-
 testsuite/tests/typecheck/should_fail/all.T        |   8 +-
 .../{tcfail219.hs-boot => tcfail219.hsig}          |   0
 .../tests/typecheck/should_fail/tcfail219.stderr   |   5 +-
 .../{tcfail220.hs-boot => tcfail220.hsig}          |   0
 .../tests/typecheck/should_fail/tcfail220.stderr   |  10 +-
 .../{tcfail221.hs-boot => tcfail221.hsig}          |   0
 .../tests/typecheck/should_fail/tcfail221.stderr   |   8 +-
 .../{tcfail222.hs-boot => tcfail222.hsig}          |   0
 .../tests/typecheck/should_fail/tcfail222.stderr   |   6 +-
 utils/ghctags/Main.hs                              |   7 +-
 utils/haddock                                      |   2 +-
 58 files changed, 230 insertions(+), 479 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 ac1a379363618a6f2f17fff65ce9129164b6ef30