ecc8511 · patch · git.iko.soy

git.iko.soy/patch

Fix semigroup imports

commitecc85114426377494793ef9db275871fc093bbff authorJohn Ericson <John.Ericson@Obsidian.Systems> dateThu 23 Jan 2020, 11:52 (7 years ago) parent3e78a72

8 files changed+16−7

compare with develop

unifiedsplit

src/Data/Patch.hs+1−1 src/Data/Patch/Class.hs+3 src/Data/Patch/DMap.hs+3 src/Data/Patch/DMapWithMove.hs+3−1 src/Data/Patch/IntMap.hs+1−1 src/Data/Patch/Map.hs+2−1 src/Data/Patch/MapWithMove.hs+2−2 src/Data/Patch/MapWithPatchingMove.hs+1−1

src/Data/Patch.hs+1−1

@@ -18,7 +18,7 @@ import Data.Functor.Const (Const (..))

1818import Data.Functor.Identity

1919import Data.Map.Monoidal (MonoidalMap)

2020import Data.Proxy

21−#if !MIN_VERSION_base(4,10,0)

21+#if !MIN_VERSION_base(4,11,0)

2222import Data.Semigroup (Semigroup (..))

2323#endif

2424import GHC.Generics

src/Data/Patch/Class.hs+3

@@ -1,10 +1,13 @@

1+{-# LANGUAGE CPP #-}

12{-# LANGUAGE TypeFamilies #-}

23-- | The interface for types which represent changes made to other types

34module Data.Patch.Class where

56import Data.Functor.Identity

67import Data.Maybe

8+#if !MIN_VERSION_base(4,11,0)

79import Data.Semigroup (Semigroup(..))

10+#endif

811import Data.Proxy

912

1013-- | A 'Patch' type represents a kind of change made to a datastructure.

src/Data/Patch/DMap.hs+3

@@ -1,3 +1,4 @@

1+{-# LANGUAGE CPP #-}

12{-# LANGUAGE GeneralizedNewtypeDeriving #-}

23{-# LANGUAGE LambdaCase #-}

34{-# LANGUAGE PolyKinds #-}

@@ -20,7 +21,9 @@ import Data.Functor.Misc

2021import qualified Data.IntMap as IntMap

2122import qualified Data.Map as Map

2223import Data.Monoid.DecidablyEmpty

24+#if !MIN_VERSION_base(4,11,0)

2325import Data.Semigroup (Semigroup (..))

26+#endif

2427import Data.Some (Some)

2528

2629-- | A set of changes to a 'DMap'. Any element may be inserted/updated or deleted.

src/Data/Patch/DMapWithMove.hs+3−1

@@ -30,7 +30,9 @@ import Data.GADT.Show (GShow, gshow)

3030import qualified Data.Map as Map

3131import Data.Maybe

3232import Data.Monoid.DecidablyEmpty

33−import Data.Semigroup (Semigroup (..), (<>))

33+#if !MIN_VERSION_base(4,11,0)

34+import Data.Semigroup (Semigroup (..))

35+#endif

3436import Data.Some (Some(Some))

3537import Data.These

3638

src/Data/Patch/IntMap.hs+1−1

@@ -16,7 +16,7 @@ import Data.IntMap.Strict (IntMap)

1616import qualified Data.IntMap.Strict as IntMap

1717import Data.Maybe

1818import Data.Monoid.DecidablyEmpty

19−#if !MIN_VERSION_base(4,10,0)

19+#if !MIN_VERSION_base(4,11,0)

2020import Data.Semigroup (Semigroup (..))

2121#endif

2222import Data.Patch.Class

src/Data/Patch/Map.hs+2−1

@@ -1,3 +1,4 @@

1+{-# LANGUAGE CPP #-}

12{-# LANGUAGE DeriveTraversable #-}

23{-# LANGUAGE FlexibleInstances #-}

34{-# LANGUAGE GeneralizedNewtypeDeriving #-}

@@ -18,7 +19,7 @@ import Data.Map (Map)

1819import qualified Data.Map as Map

1920import Data.Maybe

2021import Data.Monoid.DecidablyEmpty

21−import Data.Semigroup

22+import Data.Semigroup (Semigroup (..), stimesIdempotentMonoid)

2223

2324-- | A set of changes to a 'Map'. Any element may be inserted/updated or

2425-- deleted. Insertions are represented as values wrapped in 'Just', while

src/Data/Patch/MapWithMove.hs+2−2

@@ -25,8 +25,8 @@ import Data.List

2525import Data.Map (Map)

2626import qualified Data.Map as Map

2727import Data.Maybe

28−#if !MIN_VERSION_base(4,10,0)

29−import Data.Semigroup (Semigroup (..), (<>))

28+#if !MIN_VERSION_base(4,11,0)

29+import Data.Semigroup (Semigroup (..))

3030#endif

3131import qualified Data.Set as Set

3232import Data.These (These(..))

src/Data/Patch/MapWithPatchingMove.hs+1−1

@@ -26,7 +26,7 @@ import Data.List

2626import Data.Map (Map)

2727import qualified Data.Map as Map

2828import Data.Maybe

29−#if !MIN_VERSION_base(4,10,0)

29+#if !MIN_VERSION_base(4,11,0)

3030import Data.Semigroup (Semigroup (..))

3131#endif

3232import Data.Monoid.DecidablyEmpty