[commit: ghc] ghc-8.4: MkIface: Ensure syntactic compatibility with ghc 8.0.1 (f3f60b0)

git at git.haskell.org git at git.haskell.org
Fri Dec 22 17:45:01 UTC 2017


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

On branch  : ghc-8.4
Link       : http://ghc.haskell.org/trac/ghc/changeset/f3f60b04bc198891e342faa66255e7e31068ec57/ghc

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

commit f3f60b04bc198891e342faa66255e7e31068ec57
Author: Ben Gamari <ben at smart-cactus.org>
Date:   Mon Dec 18 17:16:22 2017 -0500

    MkIface: Ensure syntactic compatibility with ghc 8.0.1
    
    Prior to 8.0.2 MultiWayIf syntax required that the -> token be indented relative
    to the guard. See #10807.


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

f3f60b04bc198891e342faa66255e7e31068ec57
 compiler/iface/MkIface.hs | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/compiler/iface/MkIface.hs b/compiler/iface/MkIface.hs
index 6d696d9..bb19a9e 100644
--- a/compiler/iface/MkIface.hs
+++ b/compiler/iface/MkIface.hs
@@ -1275,11 +1275,11 @@ checkOptimHash hsc_env iface = do
     new_hash <- liftIO $ fingerprintOptFlags (hsc_dflags hsc_env)
                                                putNameLiterally
     if | old_hash == new_hash
-       -> up_to_date (text "Optimisation flags unchanged")
+         -> up_to_date (text "Optimisation flags unchanged")
        | gopt Opt_IgnoreOptimChanges (hsc_dflags hsc_env)
-       -> up_to_date (text "Optimisation flags changed; ignoring")
+         -> up_to_date (text "Optimisation flags changed; ignoring")
        | otherwise
-       -> out_of_date_hash "Optimisation flags changed"
+         -> out_of_date_hash "Optimisation flags changed"
                      (text "  Optimisation flags have changed")
                      old_hash new_hash
 
@@ -1290,11 +1290,11 @@ checkHpcHash hsc_env iface = do
     new_hash <- liftIO $ fingerprintHpcFlags (hsc_dflags hsc_env)
                                                putNameLiterally
     if | old_hash == new_hash
-       -> up_to_date (text "HPC flags unchanged")
+         -> up_to_date (text "HPC flags unchanged")
        | gopt Opt_IgnoreHpcChanges (hsc_dflags hsc_env)
-       -> up_to_date (text "HPC flags changed; ignoring")
+         -> up_to_date (text "HPC flags changed; ignoring")
        | otherwise
-       -> out_of_date_hash "HPC flags changed"
+         -> out_of_date_hash "HPC flags changed"
                      (text "  HPC flags have changed")
                      old_hash new_hash
 



More information about the ghc-commits mailing list