summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDave Laing <dave.laing.80@gmail.com>2017-01-26 12:32:24 -0500
committerRyan Scott <ryan.gl.scott@gmail.com>2017-01-26 12:32:25 -0500
commit3eebd1f5fd56689baa63fcc63b7f4bde0ae70d0b (patch)
tree7d35f3b1fc1ca3cb57642a392cd37b73dfec3353
parentad3d2dfa19a1ed788c682e8b0c7c6e66e63d3f79 (diff)
downloadhaskell-3eebd1f5fd56689baa63fcc63b7f4bde0ae70d0b.tar.gz
Generalizes the type of asProxyTypeOf (#12805)
Test Plan: validate Reviewers: austin, hvr, bgamari, RyanGlScott, simonpj Reviewed By: RyanGlScott, simonpj Subscribers: simonpj, RyanGlScott, thomie Differential Revision: https://phabricator.haskell.org/D3017 GHC Trac Issues: #12805
-rw-r--r--libraries/base/Data/Proxy.hs2
-rw-r--r--libraries/base/changelog.md2
2 files changed, 3 insertions, 1 deletions
diff --git a/libraries/base/Data/Proxy.hs b/libraries/base/Data/Proxy.hs
index 2f619b241f..d6f03548f3 100644
--- a/libraries/base/Data/Proxy.hs
+++ b/libraries/base/Data/Proxy.hs
@@ -113,6 +113,6 @@ instance MonadPlus Proxy
-- It is usually used as an infix operator, and its typing forces its first
-- argument (which is usually overloaded) to have the same type as the tag
-- of the second.
-asProxyTypeOf :: a -> Proxy a -> a
+asProxyTypeOf :: a -> proxy a -> a
asProxyTypeOf = const
{-# INLINE asProxyTypeOf #-}
diff --git a/libraries/base/changelog.md b/libraries/base/changelog.md
index 608830a9d6..40e18ff792 100644
--- a/libraries/base/changelog.md
+++ b/libraries/base/changelog.md
@@ -43,6 +43,8 @@
* Add `type family AppendSymbol (m :: Symbol) (n :: Symbol) :: Symbol` to `GHC.TypeLits`
(#12162)
+ * The type of `asProxyTypeOf` in `Data.Proxy` has been generalized (#12805)
+
## 4.9.0.0 *May 2016*
* Bundled with GHC 8.0