X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=utils%2Fhpc%2FHpcCombine.hs;h=ea23ab982d419cad392fb19a3aaa4aaacc9a2510;hb=4799dfb37be922c17451f8e0f7c8d765a7a7eaab;hp=193b03c5ce5998742d7f11f7706dc1698809c561;hpb=11d36d9f0256a3a3ef2934a776924f7c90afb6de;p=ghc-hetmet.git

diff --git a/utils/hpc/HpcCombine.hs b/utils/hpc/HpcCombine.hs
index 193b03c..ea23ab9 100644
--- a/utils/hpc/HpcCombine.hs
+++ b/utils/hpc/HpcCombine.hs
@@ -11,14 +11,18 @@ import Trace.Hpc.Util
 import HpcFlags
 
 import Control.Monad
-import qualified Data.Map as Map
-import qualified Data.Set as Set
-
+import qualified HpcSet as Set
+import qualified HpcMap as Map
 import System.Environment
 
 ------------------------------------------------------------------------------
-combine_options = 
-  [ excludeOpt,includeOpt,outputOpt,combineFunOpt, combineFunOptInfo, postInvertOpt ]
+combine_options 
+        = excludeOpt
+        . includeOpt
+        . outputOpt
+        . combineFunOpt
+        . combineFunOptInfo
+        . postInvertOpt
        	 
 combine_plugin = Plugin { name = "combine"
 	      	       , usage = "[OPTION] .. <TIX_FILE> [<TIX_FILE> [<TIX_FILE> ..]]"