diff options
| author | Krzysztof Gogolewski <krzysztof.gogolewski@tweag.io> | 2020-10-10 17:03:02 +0200 |
|---|---|---|
| committer | Marge Bot <ben+marge-bot@smart-cactus.org> | 2020-10-15 04:30:27 -0400 |
| commit | 51c4b851965abdece2f88f8e583256e15f3140fe (patch) | |
| tree | 56c31e593bc53664514628d5bcdea822880b62d1 /libraries | |
| parent | 0c4bfed849d454bee707fcb2989eb7c6339eaedb (diff) | |
| download | haskell-51c4b851965abdece2f88f8e583256e15f3140fe.tar.gz | |
Remove Proxy# argument in Data.Typeable.Internal
No longer neccessary - TypeRep is now indexed, there is no ambiguity.
Also fix a comment in Evidence.hs, IsLabel no longer takes a Proxy#.
Diffstat (limited to 'libraries')
| -rw-r--r-- | libraries/base/Data/Typeable/Internal.hs | 8 | ||||
| -rw-r--r-- | libraries/base/GHC/Exception.hs-boot | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/libraries/base/Data/Typeable/Internal.hs b/libraries/base/Data/Typeable/Internal.hs index 81cd3caf22..85abebf331 100644 --- a/libraries/base/Data/Typeable/Internal.hs +++ b/libraries/base/Data/Typeable/Internal.hs @@ -979,12 +979,12 @@ mkTypeLitTyCon name kind_tycon where kind = KindRepTyConApp kind_tycon [] -- | Used to make `'Typeable' instance for things of kind Nat -typeNatTypeRep :: KnownNat a => Proxy# a -> TypeRep a -typeNatTypeRep p = typeLitTypeRep (show (natVal' p)) tcNat +typeNatTypeRep :: forall a. KnownNat a => TypeRep a +typeNatTypeRep = typeLitTypeRep (show (natVal' (proxy# @a))) tcNat -- | Used to make `'Typeable' instance for things of kind Symbol -typeSymbolTypeRep :: KnownSymbol a => Proxy# a -> TypeRep a -typeSymbolTypeRep p = typeLitTypeRep (show (symbolVal' p)) tcSymbol +typeSymbolTypeRep :: forall a. KnownSymbol a => TypeRep a +typeSymbolTypeRep = typeLitTypeRep (show (symbolVal' (proxy# @a))) tcSymbol mkTypeLitFromString :: TypeLitSort -> String -> SomeTypeRep mkTypeLitFromString TypeLitSymbol s = diff --git a/libraries/base/GHC/Exception.hs-boot b/libraries/base/GHC/Exception.hs-boot index 4507b20790..86502c9ae6 100644 --- a/libraries/base/GHC/Exception.hs-boot +++ b/libraries/base/GHC/Exception.hs-boot @@ -14,7 +14,7 @@ More dramatically GHC.Exception imports Data.Typeable -imports Data.Typeable.Internals +imports Data.Typeable.Internal imports GHC.Arr (fingerprint representation etc) imports GHC.Real imports {-# SOURCE #-} GHC.Exception |