diagrams-core 1.4.0.1 → 1.4.1
raw patch · 7 files changed
+29/−7 lines, 7 filesdep ~basedep ~lensdep ~monoid-extrasPVP: major bump suggested
API removals or changes: PVP suggests a major version bump
Dependency ranges changed: base, lens, monoid-extras
API changes (from Hackage documentation)
- Diagrams.Core.Envelope: instance Diagrams.Core.Envelope.Enveloped b => Diagrams.Core.Envelope.Enveloped (Data.Map.Base.Map k b)
- Diagrams.Core.Envelope: instance Diagrams.Core.Envelope.Enveloped b => Diagrams.Core.Envelope.Enveloped (Data.Set.Base.Set b)
- Diagrams.Core.HasOrigin: instance (Diagrams.Core.HasOrigin.HasOrigin t, GHC.Classes.Ord t) => Diagrams.Core.HasOrigin.HasOrigin (Data.Set.Base.Set t)
- Diagrams.Core.HasOrigin: instance Diagrams.Core.HasOrigin.HasOrigin t => Diagrams.Core.HasOrigin.HasOrigin (Data.Map.Base.Map k t)
- Diagrams.Core.Juxtapose: instance (Diagrams.Core.Envelope.Enveloped b, Diagrams.Core.HasOrigin.HasOrigin b) => Diagrams.Core.Juxtapose.Juxtaposable (Data.Map.Base.Map k b)
- Diagrams.Core.Juxtapose: instance (Diagrams.Core.Envelope.Enveloped b, Diagrams.Core.HasOrigin.HasOrigin b, GHC.Classes.Ord b) => Diagrams.Core.Juxtapose.Juxtaposable (Data.Set.Base.Set b)
- Diagrams.Core.Names: instance (GHC.Classes.Ord a, Diagrams.Core.Names.Qualifiable a) => Diagrams.Core.Names.Qualifiable (Data.Set.Base.Set a)
- Diagrams.Core.Names: instance Diagrams.Core.Names.Qualifiable a => Diagrams.Core.Names.Qualifiable (Data.Map.Base.Map k a)
- Diagrams.Core.Style: instance (Diagrams.Core.Style.HasStyle a, GHC.Classes.Ord a) => Diagrams.Core.Style.HasStyle (Data.Set.Base.Set a)
- Diagrams.Core.Style: instance Diagrams.Core.Style.HasStyle a => Diagrams.Core.Style.HasStyle (Data.Map.Base.Map k a)
- Diagrams.Core.Trace: instance Diagrams.Core.Trace.Traced b => Diagrams.Core.Trace.Traced (Data.Map.Base.Map k b)
- Diagrams.Core.Trace: instance Diagrams.Core.Trace.Traced b => Diagrams.Core.Trace.Traced (Data.Set.Base.Set b)
- Diagrams.Core.Transform: instance (Diagrams.Core.Transform.Transformable t, GHC.Classes.Ord t) => Diagrams.Core.Transform.Transformable (Data.Set.Base.Set t)
- Diagrams.Core.Transform: instance Diagrams.Core.Transform.Transformable t => Diagrams.Core.Transform.Transformable (Data.Map.Base.Map k t)
+ Diagrams.Core.Envelope: instance Diagrams.Core.Envelope.Enveloped b => Diagrams.Core.Envelope.Enveloped (Data.Map.Internal.Map k b)
+ Diagrams.Core.Envelope: instance Diagrams.Core.Envelope.Enveloped b => Diagrams.Core.Envelope.Enveloped (Data.Set.Internal.Set b)
+ Diagrams.Core.HasOrigin: instance (Diagrams.Core.HasOrigin.HasOrigin t, GHC.Classes.Ord t) => Diagrams.Core.HasOrigin.HasOrigin (Data.Set.Internal.Set t)
+ Diagrams.Core.HasOrigin: instance Diagrams.Core.HasOrigin.HasOrigin t => Diagrams.Core.HasOrigin.HasOrigin (Data.Map.Internal.Map k t)
+ Diagrams.Core.Juxtapose: instance (Diagrams.Core.Envelope.Enveloped b, Diagrams.Core.HasOrigin.HasOrigin b) => Diagrams.Core.Juxtapose.Juxtaposable (Data.Map.Internal.Map k b)
+ Diagrams.Core.Juxtapose: instance (Diagrams.Core.Envelope.Enveloped b, Diagrams.Core.HasOrigin.HasOrigin b, GHC.Classes.Ord b) => Diagrams.Core.Juxtapose.Juxtaposable (Data.Set.Internal.Set b)
+ Diagrams.Core.Names: instance (GHC.Classes.Ord a, Diagrams.Core.Names.Qualifiable a) => Diagrams.Core.Names.Qualifiable (Data.Set.Internal.Set a)
+ Diagrams.Core.Names: instance Diagrams.Core.Names.Qualifiable a => Diagrams.Core.Names.Qualifiable (Data.Map.Internal.Map k a)
+ Diagrams.Core.Style: instance (Diagrams.Core.Style.HasStyle a, GHC.Classes.Ord a) => Diagrams.Core.Style.HasStyle (Data.Set.Internal.Set a)
+ Diagrams.Core.Style: instance Diagrams.Core.Style.HasStyle a => Diagrams.Core.Style.HasStyle (Data.Map.Internal.Map k a)
+ Diagrams.Core.Trace: instance Diagrams.Core.Trace.Traced b => Diagrams.Core.Trace.Traced (Data.Map.Internal.Map k b)
+ Diagrams.Core.Trace: instance Diagrams.Core.Trace.Traced b => Diagrams.Core.Trace.Traced (Data.Set.Internal.Set b)
+ Diagrams.Core.Transform: instance (Diagrams.Core.Transform.Transformable t, GHC.Classes.Ord t) => Diagrams.Core.Transform.Transformable (Data.Set.Internal.Set t)
+ Diagrams.Core.Transform: instance Diagrams.Core.Transform.Transformable t => Diagrams.Core.Transform.Transformable (Data.Map.Internal.Map k t)
+ Diagrams.Core.Types: instance Data.Semigroup.Semigroup (Diagrams.Core.Types.Render Diagrams.Core.Types.NullBackend v n)
- Diagrams.Core: class Backend b v n where data Render b v n :: * type Result b v n :: * data Options b v n :: * adjustDia _ o d = (o, mempty, d) where {
+ Diagrams.Core: class Backend b v n where {
- Diagrams.Core: class (Typeable a, Ord a, Show a) => IsName a where toName = Name . (: []) . AName
+ Diagrams.Core: class (Typeable a, Ord a, Show a) => IsName a
- Diagrams.Core: relative :: (Additive f, Num a) => Point f a -> Iso' (Point f a) (f a)
+ Diagrams.Core: relative :: (Additive f, Num a) => Point f a -> Iso' Point f a f a
- Diagrams.Core.Names: class (Typeable a, Ord a, Show a) => IsName a where toName = Name . (: []) . AName
+ Diagrams.Core.Names: class (Typeable a, Ord a, Show a) => IsName a
- Diagrams.Core.Points: _Point :: (Profunctor p, Functor f) => p (f a) (f (f a)) -> p (Point f a) (f (Point f a))
+ Diagrams.Core.Points: _Point :: (Profunctor p, Functor f) => p f a f f a -> p Point f a f Point f a
- Diagrams.Core.Points: relative :: (Additive f, Num a) => Point f a -> Iso' (Point f a) (f a)
+ Diagrams.Core.Points: relative :: (Additive f, Num a) => Point f a -> Iso' Point f a f a
- Diagrams.Core.Types: class Backend b v n where data Render b v n :: * type Result b v n :: * data Options b v n :: * adjustDia _ o d = (o, mempty, d) where {
+ Diagrams.Core.Types: class Backend b v n where {
Files
- CHANGELOG.md +7/−1
- diagrams-core.cabal +4/−4
- src/Diagrams/Core/Compile.hs +1/−0
- src/Diagrams/Core/Measure.hs +4/−0
- src/Diagrams/Core/Names.hs +3/−0
- src/Diagrams/Core/Trace.hs +3/−0
- src/Diagrams/Core/Types.hs +7/−2
CHANGELOG.md view
@@ -1,4 +1,10 @@-## v1.4.0.1 (???)+## [v1.4.1](https://github.com/diagrams/diagrams-core/tree/v1.4.1) (2018-04-10)++* Allow `base-4.11`+* Allow `lens-4.16`+* Add `Semigroup` instance to build on GHC 8.4++## v1.4.0.1 * Allow base-4.10
diagrams-core.cabal view
@@ -1,5 +1,5 @@ Name: diagrams-core-Version: 1.4.0.1+Version: 1.4.1 Synopsis: Core libraries for diagrams EDSL Description: The core modules underlying diagrams, an embedded domain-specific language@@ -15,7 +15,7 @@ Cabal-version: >=1.18 Extra-source-files: CHANGELOG.md, README.markdown, diagrams/*.svg extra-doc-files: diagrams/*.svg-Tested-with: GHC == 7.6.3, GHC == 7.8.4, GHC == 7.10.2, GHC == 8.0.1+Tested-with: GHC == 7.8.4, GHC == 7.10.2, GHC == 8.0.1, GHC == 8.2.2, GHC == 8.4.1 Source-repository head type: git location: git://github.com/diagrams/diagrams-core.git@@ -36,13 +36,13 @@ Diagrams.Core.Types, Diagrams.Core.V - Build-depends: base >= 4.2 && < 4.11,+ Build-depends: base >= 4.2 && < 4.12, containers >= 0.4.2 && < 0.6, unordered-containers >= 0.2 && < 0.3, semigroups >= 0.8.4 && < 0.19, monoid-extras >= 0.3 && < 0.5, dual-tree >= 0.2 && < 0.3,- lens >= 4.0 && < 4.16,+ lens >= 4.0 && < 4.17, linear >= 1.11.3 && < 1.21, adjunctions >= 4.0 && < 5.0, distributive >=0.2.2 && < 1.0,
src/Diagrams/Core/Compile.hs view
@@ -1,5 +1,6 @@ {-# LANGUAGE CPP #-} {-# LANGUAGE FlexibleContexts #-}+{-# LANGUAGE MonoLocalBinds #-} {-# LANGUAGE MultiParamTypeClasses #-} {-# LANGUAGE ScopedTypeVariables #-} {-# LANGUAGE TypeOperators #-}
src/Diagrams/Core/Measure.hs view
@@ -2,6 +2,10 @@ {-# LANGUAGE DeriveFunctor #-} {-# LANGUAGE GeneralizedNewtypeDeriving #-} {-# LANGUAGE TypeFamilies #-}++{-# OPTIONS_GHC -fno-warn-unused-imports #-}+ -- for Data.Semigroup import, which becomes redundant under GHC 8.4+ module Diagrams.Core.Measure ( Measured (..) , Measure
src/Diagrams/Core/Names.hs view
@@ -6,6 +6,9 @@ {-# LANGUAGE TypeFamilies #-} {-# LANGUAGE TypeSynonymInstances #-} +{-# OPTIONS_GHC -fno-warn-unused-imports #-}+ -- for Data.Semigroup import, which becomes redundant under GHC 8.4+ ----------------------------------------------------------------------------- -- | -- Module : Diagrams.Core.Names
src/Diagrams/Core/Trace.hs view
@@ -7,6 +7,9 @@ {-# LANGUAGE TypeFamilies #-} {-# LANGUAGE UndecidableInstances #-} +{-# OPTIONS_GHC -fno-warn-unused-imports #-}+ -- for Data.Semigroup import, which becomes redundant under GHC 8.4+ ----------------------------------------------------------------------------- -- | -- Module : Diagrams.Core.Trace
src/Diagrams/Core/Types.hs view
@@ -966,9 +966,14 @@ -- -- because it overlaps with the Renderable instance for NullPrim. +instance Semigroup (Render NullBackend v n) where+ _ <> _ = NullBackendRender+ instance Monoid (Render NullBackend v n) where- mempty = NullBackendRender- mappend _ _ = NullBackendRender+ mempty = NullBackendRender+#if !MIN_VERSION_base(4,11,0)+ mappend = (<>)+#endif instance Backend NullBackend v n where data Render NullBackend v n = NullBackendRender