3c49e24 · typeable/attoparsec

git.iko.soy/typeable/attoparsec

Clean up remaining GHC 7.10 warnings

commit3c49e243713b82de19b7a61df69e4c5705089f6d authorBryan O'Sullivan <bos@serpentine.com> dateSun 5 Apr 2015, 12:24 (12 years ago) parent8a0e20b

15 files changed+38−26

compare with master

unifiedsplit

Data/Attoparsec/ByteString/Char8.hs+2−2 Data/Attoparsec/ByteString/Internal.hs+6−2 Data/Attoparsec/Combinator.hs+2−3 Data/Attoparsec/Internal.hs+3−1 Data/Attoparsec/Text.hs+2−2 Data/Attoparsec/Text/Internal.hs+5−2 benchmarks/Aeson.hs+6−2 benchmarks/Links.hs+2−2 benchmarks/Numbers.hs+1 benchmarks/warp-3.0.1.1/Network/Wai/Handler/Warp/RequestHeader.hs+1−1 tests/QC/Buffer.hs+1−1 tests/QC/ByteString.hs+1−2 tests/QC/Combinator.hs+4−2 tests/QC/Common.hs+1−2 tests/QC/Text.hs+1−2

Data/Attoparsec/ByteString/Char8.hs+2−2

@@ -128,10 +128,10 @@ module Data.Attoparsec.ByteString.Char8

128128 ) where

129129

130130#if !MIN_VERSION_base(4,8,0)

131−import Control.Applicative (pure, (*>), (<*))

131+import Control.Applicative (pure, (*>), (<*), (<$>))

132132import Data.Word (Word)

133133#endif

134−import Control.Applicative ((<$>), (<|>))

134+import Control.Applicative ((<|>))

135135import Control.Monad (void, when)

136136import Data.Attoparsec.ByteString.FastSet (charClass, memberChar)

137137import Data.Attoparsec.ByteString.Internal (Parser)

Data/Attoparsec/ByteString/Internal.hs+6−2

@@ -1,4 +1,5 @@

1−{-# LANGUAGE BangPatterns, GADTs, OverloadedStrings, RankNTypes, RecordWildCards #-}

1+{-# LANGUAGE BangPatterns, CPP, GADTs, OverloadedStrings, RankNTypes,

2+ RecordWildCards #-}

23-- |

34-- Module : Data.Attoparsec.ByteString.Internal

45-- Copyright : Bryan O'Sullivan 2007-2015

@@ -65,7 +66,10 @@ module Data.Attoparsec.ByteString.Internal

6566 , atEnd

6667 ) where

6768

68−import Control.Applicative ((<|>), (<$>))

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

70+import Control.Applicative ((<$>))

71+#endif

72+import Control.Applicative ((<|>))

6973import Control.Monad (when)

7074import Data.Attoparsec.ByteString.Buffer (Buffer, buffer)

7175import Data.Attoparsec.ByteString.FastSet (charClass, memberWord8)

Data/Attoparsec/Combinator.hs+2−3

@@ -40,11 +40,10 @@ module Data.Attoparsec.Combinator

4040 ) where

4141

4242#if !MIN_VERSION_base(4,8,0)

43−import Control.Applicative (Applicative(..))

43+import Control.Applicative (Applicative(..), (<$>))

4444import Data.Monoid (Monoid(mappend))

4545#endif

46−import Control.Applicative (Alternative(..), empty, liftA2, many, (<|>),

47− (<$>))

46+import Control.Applicative (Alternative(..), empty, liftA2, many, (<|>))

4847import Control.Monad (MonadPlus(..))

4948import Data.Attoparsec.Internal.Types (Parser(..), IResult(..))

5049import Data.Attoparsec.Internal (endOfInput, atEnd, satisfyElem)

Data/Attoparsec/Internal.hs+3−1

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

1−{-# LANGUAGE BangPatterns, ScopedTypeVariables #-}

1+{-# LANGUAGE BangPatterns, CPP, ScopedTypeVariables #-}

22-- |

33-- Module : Data.Attoparsec.Internal

44-- Copyright : Bryan O'Sullivan 2007-2015

@@ -22,7 +22,9 @@ module Data.Attoparsec.Internal

2222 , satisfyElem

2323 ) where

2424

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

2526import Control.Applicative ((<$>))

27+#endif

2628import Data.Attoparsec.Internal.Types

2729import Data.ByteString (ByteString)

2830import Data.Text (Text)

Data/Attoparsec/Text.hs+2−2

@@ -126,10 +126,10 @@ module Data.Attoparsec.Text

126126 ) where

127127

128128#if !MIN_VERSION_base(4,8,0)

129−import Control.Applicative (pure, (*>), (<*))

129+import Control.Applicative (pure, (*>), (<*), (<$>))

130130import Data.Word (Word)

131131#endif

132−import Control.Applicative ((<$>), (<|>))

132+import Control.Applicative ((<|>))

133133import Data.Attoparsec.Combinator

134134import Data.Attoparsec.Number (Number(..))

135135import Data.Scientific (Scientific)

Data/Attoparsec/Text/Internal.hs+5−2

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

1−{-# LANGUAGE BangPatterns, FlexibleInstances, GADTs, OverloadedStrings,

1+{-# LANGUAGE BangPatterns, CPP, FlexibleInstances, GADTs, OverloadedStrings,

22 Rank2Types, RecordWildCards, TypeFamilies, TypeSynonymInstances #-}

33{-# OPTIONS_GHC -fno-warn-orphans #-}

44-- |

@@ -65,7 +65,10 @@ module Data.Attoparsec.Text.Internal

6565 , atEnd

6666 ) where

6767

68−import Control.Applicative ((<|>), (<$>))

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

69+import Control.Applicative ((<$>))

70+#endif

71+import Control.Applicative ((<|>))

6972import Control.Monad (when)

7073import Data.Attoparsec.Combinator ((<?>))

7174import Data.Attoparsec.Internal

benchmarks/Aeson.hs+6−2

@@ -10,8 +10,13 @@ module Aeson

1010import Data.ByteString.Builder

1111 (Builder, byteString, toLazyByteString, charUtf8, word8)

1212

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

14+import Control.Applicative ((*>), (<$>), (<*), pure)

15+import Data.Monoid (mappend, mempty)

16+#endif

17+

1318import Common (pathTo)

14−import Control.Applicative ((*>), (<$>), (<*), liftA2, pure)

19+import Control.Applicative (liftA2)

1520import Control.DeepSeq (NFData(..))

1621import Control.Monad (forM)

1722import Data.Attoparsec.ByteString.Char8 (Parser, char, endOfInput, scientific,

@@ -20,7 +25,6 @@ import Data.Bits ((.|.), shiftL)

2025import Data.ByteString (ByteString)

2126import Data.Char (chr)

2227import Data.List (sort)

23−import Data.Monoid (mappend, mempty)

2428import Data.Scientific (Scientific)

2529import Data.Text (Text)

2630import Data.Text.Encoding (decodeUtf8')

benchmarks/Links.hs+2−2

@@ -5,8 +5,8 @@ module Links (links) where

55import Control.Applicative

66import Control.DeepSeq (NFData(..))

77import Criterion.Main (Benchmark, bench, nf)

8−import Data.Attoparsec as A

9−import Data.Attoparsec.Char8 as A8

8+import Data.Attoparsec.ByteString as A

9+import Data.Attoparsec.ByteString.Char8 as A8

1010import Data.ByteString.Char8 as B8

1111

1212data Link = Link {

benchmarks/Numbers.hs+1

@@ -1,4 +1,5 @@

11{-# LANGUAGE BangPatterns #-}

2+{-# OPTIONS_GHC -fno-warn-deprecations #-}

34module Numbers (numbers) where

benchmarks/warp-3.0.1.1/Network/Wai/Handler/Warp/RequestHeader.hs+1−1

@@ -139,7 +139,7 @@ parseRequestLine requestLine@(PS fptr off len) = withForeignPtr fptr $ \ptr -> d

139139

140140parseHeader :: ByteString -> H.Header

141141parseHeader s =

142− let (k, rest) = S.breakByte 58 s -- ':'

142+ let (k, rest) = S.break (== 58) s -- ':'

143143 rest' = S.dropWhile (\c -> c == 32 || c == 9) $ S.drop 1 rest

144144 in (CI.mk k, rest')

145145

tests/QC/Buffer.hs+1−1

@@ -3,8 +3,8 @@

44module QC.Buffer (tests) where

6−import Control.Applicative ((<$>))

76#if !MIN_VERSION_base(4,8,0)

7+import Control.Applicative ((<$>))

88import Data.Monoid (Monoid(mconcat))

99#endif

1010import QC.Common ()

tests/QC/ByteString.hs+1−2

@@ -2,9 +2,8 @@

22module QC.ByteString (tests) where

44#if !MIN_VERSION_base(4,8,0)

5−import Control.Applicative ((<*>))

5+import Control.Applicative ((<*>), (<$>))

66#endif

7−import Control.Applicative ((<$>))

87import Data.Char (chr, ord, toUpper)

98import Data.Int (Int64)

109import Data.Word (Word8)

tests/QC/Combinator.hs+4−2

@@ -1,8 +1,10 @@

1−{-# LANGUAGE OverloadedStrings #-}

1+{-# LANGUAGE CPP, OverloadedStrings #-}

33module QC.Combinator where

5−import Control.Applicative

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

6+import Control.Applicative ((<*>), (<$>))

7+#endif

68import Data.Maybe (fromJust, isJust)

79import Data.Word (Word8)

810import QC.Common (Repack, parseBS, repackBS, toLazyBS)

tests/QC/Common.hs+1−2

@@ -16,9 +16,8 @@ module QC.Common

1616 ) where

1717

1818#if !MIN_VERSION_base(4,8,0)

19−import Control.Applicative ((<*>))

19+import Control.Applicative ((<*>), (<$>))

2020#endif

21−import Control.Applicative ((<$>))

2221import Data.Char (isAlpha)

2322import Test.QuickCheck

2423import Test.QuickCheck.Unicode (shrinkChar, string)

tests/QC/Text.hs+1−2

@@ -3,9 +3,8 @@

33module QC.Text (tests) where

55#if !MIN_VERSION_base(4,8,0)

6−import Control.Applicative ((<*>))

6+import Control.Applicative ((<*>), (<$>))

77#endif

8−import Control.Applicative ((<$>))

98import Data.Int (Int64)

109import Prelude hiding (take, takeWhile)

1110import QC.Common (liftOp, parseT)