Skip to content

Commit 29898f1

Browse files
authored
Merge pull request pcapriotti#422 from pcapriotti/werror
Fix warnings on recent GHC
2 parents 8f4eba5 + 1276236 commit 29898f1

File tree

2 files changed

+8
-0
lines changed

2 files changed

+8
-0
lines changed

src/Options/Applicative/Help/Core.hs

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
{-# LANGUAGE CPP #-}
12
module Options.Applicative.Help.Core (
23
cmdDesc,
34
briefDesc,
@@ -24,8 +25,12 @@ import Data.Function (on)
2425
import Data.List (sort, intersperse, groupBy)
2526
import Data.Foldable (any, foldl')
2627
import Data.Maybe (maybeToList, catMaybes, fromMaybe)
28+
#if !MIN_VERSION_base(4,8,0)
2729
import Data.Monoid (mempty)
30+
#endif
31+
#if !MIN_VERSION_base(4,11,0)
2832
import Data.Semigroup (Semigroup (..))
33+
#endif
2934
import Prelude hiding (any)
3035

3136
import Options.Applicative.Common

src/Options/Applicative/Help/Pretty.hs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
{-# LANGUAGE CPP #-}
12
module Options.Applicative.Help.Pretty
23
( module Text.PrettyPrint.ANSI.Leijen
34
, (.$.)
@@ -6,7 +7,9 @@ module Options.Applicative.Help.Pretty
67
) where
78

89
import Control.Applicative
10+
#if !MIN_VERSION_base(4,11,0)
911
import Data.Semigroup ((<>))
12+
#endif
1013

1114
import Text.PrettyPrint.ANSI.Leijen hiding ((<$>), (<>), columns)
1215
import Text.PrettyPrint.ANSI.Leijen.Internal (Doc (..), flatten)

0 commit comments

Comments
 (0)