[commit: packages/hoopl] master: Fix deprecation warnings from containers (8ee2ae0)

git at git.haskell.org git at git.haskell.org
Mon Apr 17 21:37:42 UTC 2017


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

On branch  : master
Link       : http://git.haskell.org/packages/hoopl.git/commitdiff/8ee2ae077a3ae1b75a882396a4a1822f53be4388

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

commit 8ee2ae077a3ae1b75a882396a4a1822f53be4388
Author: Erik de Castro Lopo <erikd at mega-nerd.com>
Date:   Sat Jan 28 16:58:27 2017 +1100

    Fix deprecation warnings from containers
    
    Also bumps the lower bound on containers to `>= 0.5` which should be fine
    since `0.5.0.0` ws released in 2012.


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

8ee2ae077a3ae1b75a882396a4a1822f53be4388
 hoopl.cabal                  | 4 ++--
 src/Compiler/Hoopl/Unique.hs | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/hoopl.cabal b/hoopl.cabal
index 0beb1c5..9bfda89 100644
--- a/hoopl.cabal
+++ b/hoopl.cabal
@@ -41,7 +41,7 @@ Library
 
   Hs-Source-Dirs:    src
   Build-Depends:     base >= 4.3 && < 4.11,
-                     containers >= 0.4 && < 0.6
+                     containers >= 0.5 && < 0.6
   Exposed-Modules:   Compiler.Hoopl,
                      Compiler.Hoopl.Internals,
                      Compiler.Hoopl.Wrappers,
@@ -73,7 +73,7 @@ Test-Suite hoopl-test
   Main-Is:           Main.hs
   Hs-Source-Dirs:    testing src
   Build-Depends:     base >= 4.3 && < 4.10,
-                     containers >= 0.4 && < 0.6,
+                     containers >= 0.5 && < 0.6,
                      filepath,
                      mtl >= 2.1.3.1,
                      parsec >= 3.1.7,
diff --git a/src/Compiler/Hoopl/Unique.hs b/src/Compiler/Hoopl/Unique.hs
index ca2ca7a..fd647ea 100644
--- a/src/Compiler/Hoopl/Unique.hs
+++ b/src/Compiler/Hoopl/Unique.hs
@@ -100,8 +100,8 @@ instance IsMap UniqueMap where
 
   mapMap f (UM m) = UM (M.map f m)
   mapMapWithKey f (UM m) = UM (M.mapWithKey (f . intToUnique) m)
-  mapFold k z (UM m) = M.fold k z m
-  mapFoldWithKey k z (UM m) = M.foldWithKey (k . intToUnique) z m
+  mapFold k z (UM m) = M.foldr k z m
+  mapFoldWithKey k z (UM m) = M.foldrWithKey (k . intToUnique) z m
   mapFilter f (UM m) = UM (M.filter f m)
 
   mapElems (UM m) = M.elems m



More information about the ghc-commits mailing list