[commit: ghc] master: s/FrontendMerge/FrontendInterface/g (3d88e89)

[git at git.haskell.org]

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

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

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

commit 3d88e8990320780520a670191d704a37bff5c910
Author: Edward Z. Yang <ezyang at cs.stanford.edu>
Date:   Mon Oct 19 19:16:14 2015 -0700

    s/FrontendMerge/FrontendInterface/g
    
    Signed-off-by: Edward Z. Yang <ezyang at cs.stanford.edu>


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

3d88e8990320780520a670191d704a37bff5c910
 compiler/main/HscMain.hs        | 4 ++--
 compiler/typecheck/TcRnTypes.hs | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/compiler/main/HscMain.hs b/compiler/main/HscMain.hs
index 1497a2d..9ffd3c9 100644
--- a/compiler/main/HscMain.hs
+++ b/compiler/main/HscMain.hs
@@ -609,7 +609,7 @@ genericHscFrontend mod_summary =
 genericHscFrontend' :: ModSummary -> Hsc FrontendResult
 genericHscFrontend' mod_summary
     | ms_hsc_src mod_summary == HsBootMerge
-    = FrontendMerge `fmap` hscMergeFrontEnd mod_summary
+    = FrontendInterface `fmap` hscMergeFrontEnd mod_summary
     | otherwise
     = FrontendTypecheck `fmap` hscFileFrontEnd mod_summary
 
@@ -662,7 +662,7 @@ hscIncrementalCompile always_do_basic_recompilation_check m_tc_result
                        ms_hsc_src mod_summary == HsSrcFile
                        then finish              hsc_env mod_summary tc_result mb_old_hash
                        else finishTypecheckOnly hsc_env mod_summary tc_result mb_old_hash
-                FrontendMerge raw_iface ->
+                FrontendInterface raw_iface ->
                             finishMerge         hsc_env mod_summary raw_iface mb_old_hash
             liftIO $ hscMaybeWriteIface dflags (hm_iface hmi) no_change mod_summary
             return (status, hmi)
diff --git a/compiler/typecheck/TcRnTypes.hs b/compiler/typecheck/TcRnTypes.hs
index 3f703fa..f4cfa4f 100644
--- a/compiler/typecheck/TcRnTypes.hs
+++ b/compiler/typecheck/TcRnTypes.hs
@@ -341,7 +341,7 @@ data DsMetaVal
 -- to have a TcGblEnv which is only defined here.
 data FrontendResult
         = FrontendTypecheck TcGblEnv
-        | FrontendMerge     ModIface
+        | FrontendInterface ModIface
 
 -- | 'TcGblEnv' describes the top-level of the module at the
 -- point at which the typechecker is finished work.