[commit: ghc] master: DsExpr: Remove usage of concatFS in fingerprintName (6c7c193)

git at git.haskell.org git at git.haskell.org
Fri Jul 8 20:38:25 UTC 2016


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

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

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

commit 6c7c193f376fe3b48992724c12f6ff393dca6528
Author: Ben Gamari <bgamari.foss at gmail.com>
Date:   Fri Jul 8 22:41:55 2016 +0200

    DsExpr: Remove usage of concatFS in fingerprintName
    
    This was the only user of concatFS and really just wants the `String`
    anyways.
    
    Stumbled upon while looking at #12357.
    
    Test Plan: Validate
    
    Reviewers: austin
    
    Reviewed By: austin
    
    Subscribers: thomie
    
    Differential Revision: https://phabricator.haskell.org/D2386


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

6c7c193f376fe3b48992724c12f6ff393dca6528
 compiler/deSugar/DsExpr.hs | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/compiler/deSugar/DsExpr.hs b/compiler/deSugar/DsExpr.hs
index 85177ee..bf04f13 100644
--- a/compiler/deSugar/DsExpr.hs
+++ b/compiler/deSugar/DsExpr.hs
@@ -54,9 +54,9 @@ import SrcLoc
 import Util
 import Bag
 import Outputable
-import FastString
 import PatSyn
 
+import Data.List        ( intercalate )
 import Data.IORef       ( atomicModifyIORef' )
 
 import Control.Monad
@@ -470,12 +470,10 @@ dsExpr (HsStatic _ expr@(L loc _)) = do
     mkStaticPtrFingerprint :: Module -> DsM Fingerprint
     mkStaticPtrFingerprint this_mod = do
       n <- mkGenPerModuleNum this_mod
-      return $ fingerprintString $ unpackFS $ concatFS
-        [ unitIdFS $ moduleUnitId this_mod
-        , fsLit ":"
-        , moduleNameFS $ moduleName this_mod
-        , fsLit ":"
-        , mkFastString $ show n
+      return $ fingerprintString $ intercalate ":"
+        [ unitIdString $ moduleUnitId this_mod
+        , moduleNameString $ moduleName this_mod
+        , show n
         ]
 
     mkGenPerModuleNum :: Module -> DsM Int



More information about the ghc-commits mailing list