c97c126 · patch · git.iko.soy

git.iko.soy/patch

Fix Semigroup CPP

commitc97c126de6f281297a6597de9de4f3ea47021086 authorJohn Ericson <John.Ericson@Obsidian.Systems> dateWed 22 Jan 2020, 14:59 (7 years ago) parentf39c676

3 files changed+7−4

compare with develop

unifiedsplit

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

src/Data/Patch.hs+2−2

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

1818import Data.Functor.Identity

1919import Data.Map.Monoidal (MonoidalMap)

2020import Data.Proxy

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

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

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

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

2323#endif

2424import GHC.Generics

2525

src/Data/Patch/MapWithMove.hs+3

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

1+{-# LANGUAGE CPP #-}

12{-# LANGUAGE DeriveTraversable #-}

23{-# LANGUAGE FlexibleContexts #-}

34{-# LANGUAGE FlexibleInstances #-}

@@ -24,7 +25,9 @@ import Data.List

2425import Data.Map (Map)

2526import qualified Data.Map as Map

2627import Data.Maybe

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

2729import Data.Semigroup (Semigroup (..), (<>))

30+#endif

2831import qualified Data.Set as Set

2932import Data.These (These(..))

3033import Data.Tuple

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

@@ -24,8 +24,8 @@ import Data.Map (Map)

2424import qualified Data.Map as Map

2525import Data.Maybe

2626--import Data.Proxy

27−#if !MIN_VERSION_base(4,9,0)

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

27+#if !MIN_VERSION_base(4,10,0)

28+import Data.Semigroup (Semigroup (..))

2929#endif

3030import Data.Monoid.DecidablyEmpty

3131import qualified Data.Set as Set