Skip to content

Commit

Permalink
update to use data-default-0.8 instead of data-default-class
Browse files Browse the repository at this point in the history
  • Loading branch information
byorgey committed Oct 25, 2024
1 parent b4a855b commit 44ce948
Show file tree
Hide file tree
Showing 17 changed files with 20 additions and 20 deletions.
2 changes: 1 addition & 1 deletion diagrams-lib.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ Library
diagrams-solve >= 0.1 && < 0.2,
active >= 0.2 && < 0.3,
colour >= 2.3.2 && < 2.4,
data-default-class < 0.2,
data-default >= 0.8 && < 0.9,
fingertree >= 0.1 && < 0.2,
intervals >= 0.7 && < 0.10,
lens >= 5.1 && < 5.4,
Expand Down
2 changes: 1 addition & 1 deletion src/Diagrams/Attributes.hs
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ import Control.Lens hiding (none, over)
import Data.Colour
import Data.Colour.RGBSpace (RGB (..))
import Data.Colour.SRGB (toSRGB)
import Data.Default.Class
import Data.Default
import Data.Distributive
import Data.Monoid.Recommend
import Data.Semigroup
Expand Down
2 changes: 1 addition & 1 deletion src/Diagrams/Combinators.hs
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ module Diagrams.Combinators
) where

import Control.Lens hiding (beside, ( # ))
import Data.Default.Class
import Data.Default
import Data.Maybe (fromJust)
import Data.Monoid.Deletable (toDeletable)
import Data.Monoid.MList (inj)
Expand Down
2 changes: 1 addition & 1 deletion src/Diagrams/Parametric/Adjust.hs
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ import Control.Lens (Lens', generateSignatures, lensRules, make
(.~), (^.))
import Data.Proxy

import Data.Default.Class
import Data.Default

import Diagrams.Core.V
import Diagrams.Parametric
Expand Down
4 changes: 2 additions & 2 deletions src/Diagrams/Prelude.hs
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ module Diagrams.Prelude

-- | For working with default values. Diagrams also exports 'with',
-- an alias for 'def'.
, module Data.Default.Class
, module Data.Default

-- | For representing and operating on colors.
, module Data.Colour
Expand Down Expand Up @@ -97,7 +97,7 @@ import Data.Active
import Data.Colour hiding (AffineSpace (..), atop, over)
import Data.Colour.Names hiding (tan)
import Data.Colour.SRGB
import Data.Default.Class
import Data.Default
import Data.Semigroup

import Linear.Affine
Expand Down
2 changes: 1 addition & 1 deletion src/Diagrams/TwoD/Adjust.hs
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ import Diagrams.TwoD.Types
import Diagrams.Util (( # ))

import Control.Lens (Lens', set, (^.))
import Data.Default.Class
import Data.Default
import Data.Semigroup


Expand Down
2 changes: 1 addition & 1 deletion src/Diagrams/TwoD/Arrow.hs
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ import Control.Lens (Lens', Traversal',
generateSignatures, lensRules,
makeLensesWith, view, (%~), (&),
(.~), (^.))
import Data.Default.Class
import Data.Default
import Data.Maybe (fromMaybe)
import Data.Monoid.Coproduct (untangle)
import Data.Semigroup
Expand Down
2 changes: 1 addition & 1 deletion src/Diagrams/TwoD/Arrowheads.hs
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ module Diagrams.TwoD.Arrowheads
) where

import Control.Lens ((&), (.~), (<>~), (^.))
import Data.Default.Class
import Data.Default
import Data.Monoid (mempty, (<>))

import Diagrams.Angle
Expand Down
2 changes: 1 addition & 1 deletion src/Diagrams/TwoD/Attributes.hs
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ module Diagrams.TwoD.Attributes (
import Control.Lens hiding (transform)
import Data.Colour hiding (AffineSpace, over)
import Data.Data
import Data.Default.Class
import Data.Default
import Data.Monoid.Recommend
import Data.Semigroup

Expand Down
2 changes: 1 addition & 1 deletion src/Diagrams/TwoD/Combinators.hs
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ module Diagrams.TwoD.Combinators

import Control.Lens ((&), (.~))
import Data.Colour
import Data.Default.Class
import Data.Default
import Data.Semigroup

import Diagrams.Core
Expand Down
2 changes: 1 addition & 1 deletion src/Diagrams/TwoD/Model.hs
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ import Control.Arrow (second)
import Control.Lens (makeLenses, (^.))
import Data.Colour (Colour)
import Data.Colour.Names
import Data.Default.Class
import Data.Default
import Data.List (intercalate)
import qualified Data.Map as M
import Data.Maybe (catMaybes)
Expand Down
6 changes: 3 additions & 3 deletions src/Diagrams/TwoD/Offset.hs
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ import Data.Maybe (catMaybes)
import Data.Monoid
import Data.Monoid.Inf

import Data.Default.Class
import Data.Default

import Diagrams.Core

Expand Down Expand Up @@ -309,7 +309,7 @@ offsetPath = offsetPath' def
-- "right" make sense.
--
-- > import Diagrams.TwoD.Offset
-- > import Data.Default.Class
-- > import Data.Default
-- >
-- > corner :: (OrderedField n) => Located (Trail V2 n)
-- > corner = fromVertices (map p2 [(0, 0), (10, 0), (5, 6)]) `at` origin
Expand Down Expand Up @@ -409,7 +409,7 @@ expandPath :: RealFloat n => n -> Path V2 n -> Path V2 n
expandPath = expandPath' def

-- > import Diagrams.TwoD.Offset
-- > import Data.Default.Class
-- > import Data.Default
-- >
-- > expandTrailExample :: Diagram SVG
-- > expandTrailExample = pad 1.1 . centerXY . hcat' (def & sep .~ 1)
Expand Down
2 changes: 1 addition & 1 deletion src/Diagrams/TwoD/Path.hs
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ import qualified Data.Foldable as F
import Data.Semigroup
import Data.Typeable

import Data.Default.Class
import Data.Default

import Diagrams.Angle
import Diagrams.Combinators (withEnvelope, withTrace)
Expand Down
2 changes: 1 addition & 1 deletion src/Diagrams/TwoD/Polygons.hs
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ import Control.Monad (forM, liftM)
import Control.Monad.ST (ST, runST)
import Data.Array.ST (STUArray, newArray, readArray,
writeArray)
import Data.Default.Class
import Data.Default
import Data.List (maximumBy, minimumBy)
import Data.Maybe (catMaybes)
import Data.Ord (comparing)
Expand Down
2 changes: 1 addition & 1 deletion src/Diagrams/TwoD/Shapes.hs
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ module Diagrams.TwoD.Shapes
) where

import Control.Lens (makeLenses, op, (&), (.~), (<>~), (^.))
import Data.Default.Class
import Data.Default
import Data.Semigroup

import Diagrams.Core
Expand Down
2 changes: 1 addition & 1 deletion src/Diagrams/TwoD/Text.hs
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ import Diagrams.TwoD.Attributes (recommendFillColor)
import Diagrams.TwoD.Types

import Data.Colour hiding (over)
import Data.Default.Class
import Data.Default
import Data.Monoid.Recommend
import Data.Semigroup
import Data.Typeable
Expand Down
2 changes: 1 addition & 1 deletion src/Diagrams/Util.hs
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ import Control.Monad
import Control.Monad.Catch
import Control.Monad.Trans
import Control.Monad.Trans.Maybe
import Data.Default.Class
import Data.Default
import Data.List
import Data.Maybe
import Data.Monoid
Expand Down

0 comments on commit 44ce948

Please sign in to comment.