tagged 0.5 → 0.6
raw patch · 3 files changed
+13/−9 lines, 3 files
Files
- CHANGELOG.markdown +5/−1
- Data/Proxy.hs +7/−7
- tagged.cabal +1/−1
CHANGELOG.markdown view
@@ -1,6 +1,10 @@+0.6+---+* On GHC 7.7, we now still export the instances we used to for `Data.Proxy.Proxy` as orphans if need be.+ 0.5 ----* On GHC 7.7 we now simply export instances for `Data.Typeable.Proxy` rather than make our own type. We still re-export it.+* On GHC 7.7 we now simply export `Data.Typeable.Proxy` rather than make our own type. We still re-export it. 0.4.5 -----
Data/Proxy.hs view
@@ -5,6 +5,10 @@ #if defined(__GLASGOW_HASKELL__) && __GLASGOW_HASKELL__ >= 706 {-# LANGUAGE PolyKinds #-} #endif+#if defined(__GLASGOW_HASKELL__) && __GLASGOW_HASKELL__ >= 707+{-# LANGUAGE StandaloneDeriving #-}+#endif+{-# OPTIONS_GHC -fno-warn-orphans #-} ---------------------------------------------------------------------------- -- | -- Module : Data.Proxy@@ -38,11 +42,11 @@ import Data.Data #endif -#if __GLASGOW_HASKELL__ >= 707-import Data.Data (Proxy)-+#if defined(__GLASGOW_HASKELL__) && __GLASGOW_HASKELL__ >= 707+deriving instance Typeable Proxy #else data Proxy s = Proxy+#endif instance Eq (Proxy s) where _ == _ = True@@ -58,7 +62,6 @@ #ifdef __GLASGOW_HASKELL__ #if __GLASGOW_HASKELL__ < 707- instance Typeable1 Proxy where typeOf1 _ = mkTyConApp proxyTyCon [] @@ -162,8 +165,6 @@ sequence _ = return Proxy {-# INLINE sequence #-} -#endif- -- | Some times you need to change the proxy you have lying around. -- Idiomatic usage is to make a new combinator for the relationship -- between the proxies that you want to enforce, and define that@@ -195,4 +196,3 @@ asProxyTypeOf :: a -> Proxy a -> a asProxyTypeOf = const {-# INLINE asProxyTypeOf #-}-
tagged.cabal view
@@ -1,5 +1,5 @@ name: tagged-version: 0.5+version: 0.6 license: BSD3 license-file: LICENSE author: Edward A. Kmett