summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLangston Barrett <langston.barrett@gmail.com>2019-02-04 08:59:56 -0800
committerMarge Bot <ben+marge-bot@smart-cactus.org>2019-02-08 11:00:19 -0500
commita9bef62ba42056039cc55a68481ed01a5bece445 (patch)
tree64397ba28ce923f7430bf339f323b05c14906d93
parentee5229834dc5e15cd1eea8427b0e00c50d0fa08b (diff)
downloadhaskell-a9bef62ba42056039cc55a68481ed01a5bece445.tar.gz
Add a changelog for base 4.14.0.0
-rw-r--r--libraries/base/Data/Functor/Compose.hs2
-rw-r--r--libraries/base/changelog.md5
2 files changed, 6 insertions, 1 deletions
diff --git a/libraries/base/Data/Functor/Compose.hs b/libraries/base/Data/Functor/Compose.hs
index 97d4a35317..44570e1b41 100644
--- a/libraries/base/Data/Functor/Compose.hs
+++ b/libraries/base/Data/Functor/Compose.hs
@@ -124,7 +124,7 @@ instance (Alternative f, Applicative g) => Alternative (Compose f g) where
-- | The deduction (via generativity) that if @g x :~: g y@ then @x :~: y@.
--
--- @since 4.13.0.0
+-- @since 4.14.0.0
instance (TestEquality f) => TestEquality (Compose f g) where
testEquality (Compose x) (Compose y) =
case testEquality x y of -- :: Maybe (g x :~: g y)
diff --git a/libraries/base/changelog.md b/libraries/base/changelog.md
index 3d178d3a16..79927950c4 100644
--- a/libraries/base/changelog.md
+++ b/libraries/base/changelog.md
@@ -1,5 +1,10 @@
# Changelog for [`base` package](http://hackage.haskell.org/package/base)
+## 4.14.0.0 *TBA*
+ * Bundled with GHC *TBA*
+
+ * Add a `TestEquality` instance for the `Compose` newtype.
+
## 4.12.0.0 *TBA*
* Bundled with GHC *TBA*