Repository : ssh://darcs.haskell.org//srv/darcs/ghc

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/1df6309ba719faa48ca6305bad1391e5907d55d9

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

commit 1df6309ba719faa48ca6305bad1391e5907d55d9
Author: Manuel M T Chakravarty <[email protected]>
Date:   Tue Aug 23 00:00:19 2011 +1000

    Remove a hack in the type checker (which is no longer needed)

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

 compiler/typecheck/TcInteract.lhs |    4 +---
 1 files changed, 1 insertions(+), 3 deletions(-)

diff --git a/compiler/typecheck/TcInteract.lhs 
b/compiler/typecheck/TcInteract.lhs
index 96d452a..1d1aab1 100644
--- a/compiler/typecheck/TcInteract.lhs
+++ b/compiler/typecheck/TcInteract.lhs
@@ -111,9 +111,7 @@ updCCanMap (a,ct) cmap
       Given {}   -> cmap { cts_given   = insert_into (cts_given cmap)   }
       Derived {} -> cmap { cts_derived = insert_into (cts_derived cmap) }
   where 
-    insert_into m = addToUFM_C (flip unionBags) m a (singleCCan ct)
-    -- The "flip" is a horrid hack to maintain constraints in the order
-    -- that the vectoriser expects them.  See Trac #5369
+    insert_into m = addToUFM_C unionBags m a (singleCCan ct)
 
 getRelevantCts :: Uniquable a => a -> CCanMap a -> (CanonicalCts, CCanMap a) 
 -- Gets the relevant constraints and returns the rest of the CCanMap



_______________________________________________
Cvs-ghc mailing list
[email protected]
http://www.haskell.org/mailman/listinfo/cvs-ghc

Reply via email to