diff --git a/containers/changelog.md b/containers/changelog.md index 6c4115f5d9c69245f612d385ffc60fc1a290532d..2ed5b80a7f084ff43222808991c237e8d7021487 100644 --- a/containers/changelog.md +++ b/containers/changelog.md @@ -1,5 +1,13 @@ # Changelog for [`containers` package](http://github.com/haskell/containers) +## 0.6.2.1 + +* Add `disjoint` for `Map` and `IntMap` (Thanks, Simon Jakobi). + +* Fix documentation bugs (Thanks, olligobber). + +* Fix unused imports (Thanks, Ben Gamari). + ## 0.6.1.1 * Fix Foldable instance for IntMap, which previously placed positively diff --git a/containers/containers.cabal b/containers/containers.cabal index 7e903e190ce3f0dfc1349416183f12c6fe56f9b8..42c01385e0fdbf267d0de87a447152889ad4072d 100644 --- a/containers/containers.cabal +++ b/containers/containers.cabal @@ -1,5 +1,5 @@ name: containers -version: 0.6.1.1 +version: 0.6.2.1 license: BSD3 license-file: LICENSE maintainer: libraries@haskell.org diff --git a/containers/src/Data/IntMap/Internal.hs b/containers/src/Data/IntMap/Internal.hs index 9e240314db9e1b423394955193b4fb3df58d546e..095d078ceb49c0e863f6e9d6072080d77801802e 100644 --- a/containers/src/Data/IntMap/Internal.hs +++ b/containers/src/Data/IntMap/Internal.hs @@ -741,7 +741,7 @@ unsafeFindMax (Bin _ _ _ r) = unsafeFindMax r -- -- > disjoint a b == null (intersection a b) -- --- @since UNRELEASED +-- @since 0.6.2.1 disjoint :: IntMap a -> IntMap b -> Bool disjoint Nil _ = True disjoint _ Nil = True diff --git a/containers/src/Data/Map/Internal.hs b/containers/src/Data/Map/Internal.hs index 6f3dcef69fdc1b24d2636bfa8a6a86163a405d7e..1731234bdb313978d975e74fe2f28a876aba6a5c 100644 --- a/containers/src/Data/Map/Internal.hs +++ b/containers/src/Data/Map/Internal.hs @@ -2072,7 +2072,7 @@ intersectionWithKey f (Bin _ k x1 l1 r1) t2 = case mb of -- xs ``disjoint`` ys = null (xs ``intersection`` ys) -- @ -- --- @since UNRELEASED +-- @since 0.6.2.1 -- See 'Data.Set.Internal.isSubsetOfX' for some background -- on the implementation design.