Merge branch 'master' into sjakobi/issue491

Author: sjakobi

Data/HashMap/Strict.hs

@@ -19,7 +19,7 @@
 -- strings.
 --
 -- Many operations have a average-case complexity of \(O(\log n)\).  The
--- implementation uses a large base (i.e. 16) so in practice these
+-- implementation uses a large base (i.e. 32) so in practice these
 -- operations are constant time.
 module Data.HashMap.Strict
     (

tests/Properties/HashMapLazy.hs

@@ -258,10 +258,6 @@ tests =
         \(x :: HMKI) -> QC.within 1000000 $ HM.isSubmapOf x x
       , testProperty "m1 ⊆ m1 ∪ m2" $
         \(x :: HMKI) y -> QC.within 1000000 $ HM.isSubmapOf x (HM.union x y)
-      , testProperty "m1 ⊈ m2  ⇒  m1 ∪ m2 ⊈ m1" $
-        \(m1 :: HMKI) m2 ->
-          QC.within 1000000 $
-          not (HM.isSubmapOf m1 m2) ==> HM.isSubmapOf m1 (HM.union m1 m2)
       , testProperty "m1\\m2 ⊆ m1" $
         \(m1 :: HMKI) (m2 :: HMKI) ->
           QC.within 1000000 $