summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrian Wignall <brianwignall@gmail.com>2019-11-08 17:40:43 (GMT)
committerMarge Bot <ben+marge-bot@smart-cactus.org>2019-11-09 23:04:57 (GMT)
commite3672f401507fbb0803e97dde2e298552a3cac19 (patch)
tree76b75956f57222e9d1135a282292f96e32e2a27d
parent1f911de4c73d119be58c7868d0af060055ab447d (diff)
downloadghc-e3672f401507fbb0803e97dde2e298552a3cac19.zip
ghc-e3672f401507fbb0803e97dde2e298552a3cac19.tar.gz
ghc-e3672f401507fbb0803e97dde2e298552a3cac19.tar.bz2
Incorporate MR review suggestions; add change in changelog
-rwxr-xr-xlibraries/base/GHC/Exts.hs6
-rw-r--r--libraries/base/changelog.md3
2 files changed, 6 insertions, 3 deletions
diff --git a/libraries/base/GHC/Exts.hs b/libraries/base/GHC/Exts.hs
index 45f6705..9bce21c 100755
--- a/libraries/base/GHC/Exts.hs
+++ b/libraries/base/GHC/Exts.hs
@@ -211,11 +211,11 @@ instance IsList [a] where
fromList = id
toList = id
--- | @since
+-- | @since 4.15.0.0
instance IsList (ZipList a) where
- type (Item (ZipList a)) = a
+ type Item (ZipList a) = a
fromList = ZipList
- toList (ZipList as) = as
+ toList = getZipList
-- | @since 4.9.0.0
instance IsList (NonEmpty a) where
diff --git a/libraries/base/changelog.md b/libraries/base/changelog.md
index e2aa84b..50a90bc 100644
--- a/libraries/base/changelog.md
+++ b/libraries/base/changelog.md
@@ -1,5 +1,8 @@
# Changelog for [`base` package](http://hackage.haskell.org/package/base)
+## 4.15.0.0 *TBA*
+ * Add `IsList` instances for `ZipList`s.
+
## 4.14.0.0 *TBA*
* Bundled with GHC *TBA*