X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2Ftypecheck%2FFamInst.lhs;h=f85f6b926666e2b4ef343808895ee12aeb0196cc;hb=8226f00b071ea156753324dc9f2967dabc3cc571;hp=9a349435effd34b0d58fade776accf97e67ebeb2;hpb=601e8739f2af25f946a8a1b4273172b491c5bced;p=ghc-hetmet.git

diff --git a/compiler/typecheck/FamInst.lhs b/compiler/typecheck/FamInst.lhs
index 9a34943..f85f6b9 100644
--- a/compiler/typecheck/FamInst.lhs
+++ b/compiler/typecheck/FamInst.lhs
@@ -65,6 +65,7 @@ instance Ord ModulePair where
 --
 type ModulePairSet = FiniteMap ModulePair ()
 
+listToSet :: [ModulePair] -> ModulePairSet
 listToSet l = listToFM (zip l (repeat ()))
 
 checkFamInstConsistency :: [Module] -> [Module] -> TcM ()
@@ -179,7 +180,7 @@ checkForConflicts inst_envs famInst
 
        ; let { matches   = lookupFamInstEnvUnify inst_envs fam tys'
 	     ; conflicts = [ conflictingFamInst
-			   | match@(_, conflictingFamInst) <- matches
+			   | match@(conflictingFamInst, _) <- matches
 			   , conflicting fam tys' tycon match 
 			   ]
 	     }