diff options
author | Edward Z. Yang <ezyang@cs.stanford.edu> | 2015-11-13 16:18:24 -0800 |
---|---|---|
committer | Edward Z. Yang <ezyang@cs.stanford.edu> | 2015-11-16 15:32:56 -0800 |
commit | ac1a379363618a6f2f17fff65ce9129164b6ef30 (patch) | |
tree | 65a0154fa86cf8dda560f62ecc6ae7555da65ac7 /compiler/iface/LoadIface.hs | |
parent | 9193629a6d8c7605ba81e62bc7f9a04a8ce65013 (diff) | |
download | haskell-ac1a379363618a6f2f17fff65ce9129164b6ef30.tar.gz |
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
Diffstat (limited to 'compiler/iface/LoadIface.hs')
-rw-r--r-- | compiler/iface/LoadIface.hs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/compiler/iface/LoadIface.hs b/compiler/iface/LoadIface.hs index d2e16c67cb..48acd8dd28 100644 --- a/compiler/iface/LoadIface.hs +++ b/compiler/iface/LoadIface.hs @@ -897,7 +897,7 @@ pprModIface iface ] where pp_hsc_src HsBootFile = ptext (sLit "[boot]") - pp_hsc_src HsBootMerge = ptext (sLit "[merge]") + pp_hsc_src HsigFile = ptext (sLit "[hsig]") pp_hsc_src HsSrcFile = Outputable.empty {- |