ghc-typelits-extra 0.3.2 → 0.3.3
raw patch · 4 files changed
+31/−14 lines, 4 filesdep ~ghcdep ~ghc-tcplugins-extradep ~ghc-typelits-knownnatPVP: major bump suggested
API removals or changes: PVP suggests a major version bump
Dependency ranges changed: ghc, ghc-tcplugins-extra, ghc-typelits-knownnat, ghc-typelits-natnormalise
API changes (from Hackage documentation)
- GHC.TypeLits.Extra: instance (GHC.TypeNats.KnownNat x, GHC.TypeNats.KnownNat y, GHC.TypeLits.Extra.FLog x y GHC.Types.~ GHC.TypeLits.Extra.CLog x y) => GHC.TypeLits.KnownNat.KnownNat2 "GHC.TypeLits.Extra.Log" x y
+ GHC.TypeLits.Extra: instance (GHC.TypeNats.KnownNat x, GHC.TypeNats.KnownNat y, GHC.TypeLits.Extra.FLog x y Data.Type.Equality.~ GHC.TypeLits.Extra.CLog x y) => GHC.TypeLits.KnownNat.KnownNat2 "GHC.TypeLits.Extra.Log" x y
Files
- CHANGELOG.md +3/−0
- ghc-typelits-extra.cabal +10/−8
- src/GHC/TypeLits/Extra/Solver.hs +12/−5
- src/GHC/TypeLits/Extra/Solver/Unify.hs +6/−1
CHANGELOG.md view
@@ -1,5 +1,8 @@ # Changelog for the [`ghc-typelits-extra`](http://hackage.haskell.org/package/ghc-typelits-extra) package +# 0.3.3 *February 6th 2020*+* Add support for GHC 8.10.1-alpha2+ # 0.3.2 *January 18th 2020* * Fix https://github.com/clash-lang/clash-compiler/issues/1019
ghc-typelits-extra.cabal view
@@ -1,5 +1,5 @@ name: ghc-typelits-extra-version: 0.3.2+version: 0.3.3 synopsis: Additional type-level operations on GHC.TypeLits.Nat description: Additional type-level operations on @GHC.TypeLits.Nat@:@@ -47,8 +47,10 @@ extra-source-files: README.md CHANGELOG.md cabal-version: >=1.10-tested-with: GHC == 8.0.2, GHC == 8.2.2, GHC == 8.4.4, GHC == 8.6.4+tested-with: GHC == 8.0.2, GHC == 8.2.2, GHC == 8.4.4, GHC == 8.6.5,+ GHC == 8.8.1, GHC == 8.10.1 + source-repository head type: git location: https://github.com/clash-lang/ghc-typelits-extra.git@@ -66,11 +68,11 @@ GHC.TypeLits.Extra.Solver.Operations build-depends: base >= 4.8 && <5, containers >= 0.5.7.1 && <0.7,- ghc >= 7.10 && <8.9,+ ghc >= 7.10 && <8.11, ghc-prim >= 0.5 && <1.0,- ghc-tcplugins-extra >= 0.2,- ghc-typelits-knownnat >= 0.6 && <0.8,- ghc-typelits-natnormalise >= 0.6 && <0.8,+ ghc-tcplugins-extra >= 0.3.1,+ ghc-typelits-knownnat >= 0.7.2 && <0.8,+ ghc-typelits-natnormalise >= 0.7.1 && <0.8, integer-gmp >= 1.0 && <1.1, transformers >= 0.4.2.0 && <0.6 hs-source-dirs: src@@ -98,8 +100,8 @@ Other-Modules: ErrorTests build-depends: base >= 4.8 && <5, ghc-typelits-extra,- ghc-typelits-knownnat >= 0.6,- ghc-typelits-natnormalise >= 0.4.1,+ ghc-typelits-knownnat >= 0.7.2,+ ghc-typelits-natnormalise >= 0.7.1, tasty >= 0.10, tasty-hunit >= 0.9 hs-source-dirs: tests
src/GHC/TypeLits/Extra/Solver.hs view
@@ -40,11 +40,8 @@ #endif import TcEvidence (EvTerm) import TcPluginM (TcPluginM, tcLookupTyCon, tcPluginTrace)-import TcRnTypes (Ct, TcPlugin(..), TcPluginResult (..), ctEvidence, ctEvPred,- isWantedCt)-import TcType (typeKind)-import Type (EqRel (NomEq), Kind, PredTree (EqPred), classifyPredType,- eqType)+import TcRnTypes (TcPlugin(..), TcPluginResult (..))+import Type (Kind, eqType) import TyCoRep (Type (..)) import TysWiredIn (typeNatKind, promotedTrueDataCon, promotedFalseDataCon) import TcTypeNats (typeNatLeqTyCon)@@ -54,6 +51,16 @@ #else import TcPluginM (zonkCt) import Control.Monad ((<=<))+#endif++#if MIN_VERSION_ghc(8,10,0)+import Constraint (Ct, ctEvidence, ctEvPred, isWantedCt)+import Predicate (EqRel (NomEq), Pred (EqPred), classifyPredType)+import Type (typeKind)+#else+import TcRnTypes (Ct, ctEvidence, ctEvPred, isWantedCt)+import TcType (typeKind)+import Type (EqRel (NomEq), PredTree (EqPred), classifyPredType) #endif -- internal
src/GHC/TypeLits/Extra/Solver/Unify.hs view
@@ -26,11 +26,16 @@ -- GHC API import Outputable (Outputable (..), ($$), text) import TcPluginM (TcPluginM, matchFam, tcPluginTrace)-import TcRnMonad (Ct) import TcTypeNats (typeNatExpTyCon) import Type (TyVar, coreView) import TyCoRep (Type (..), TyLit (..)) import UniqSet (UniqSet, emptyUniqSet, unionUniqSets, unitUniqSet)++#if MIN_VERSION_ghc(8,10,0)+import Constraint (Ct)+#else+import TcRnMonad (Ct)+#endif -- internal import GHC.TypeLits.Extra.Solver.Operations