csv-conduit 0.7.0.0 → 0.7.1.0

raw patch · 5 files changed

+15/−7 lines, 5 filesPVP: major bump suggested

API removals or changes: PVP suggests a major version bump

API changes (from Hackage documentation)

- Data.CSV.Conduit.Conversion: instance Data.CSV.Conduit.Conversion.FromField a => Data.CSV.Conduit.Conversion.FromField (GHC.Base.Maybe a)

- Data.CSV.Conduit.Conversion: instance Data.CSV.Conduit.Conversion.ToField a => Data.CSV.Conduit.Conversion.ToField (GHC.Base.Maybe a)

- Data.CSV.Conduit.Conversion: instance Data.Semigroup.Semigroup (Data.CSV.Conduit.Conversion.Parser a)

+ Data.CSV.Conduit.Conversion: instance Data.CSV.Conduit.Conversion.FromField a => Data.CSV.Conduit.Conversion.FromField (GHC.Maybe.Maybe a)

+ Data.CSV.Conduit.Conversion: instance Data.CSV.Conduit.Conversion.ToField a => Data.CSV.Conduit.Conversion.ToField (GHC.Maybe.Maybe a)

+ Data.CSV.Conduit.Conversion: instance GHC.Base.Semigroup (Data.CSV.Conduit.Conversion.Parser a)

- Data.CSV.Conduit: CSVSettings :: !Char -> !(Maybe Char) -> CSVSettings

+ Data.CSV.Conduit: CSVSettings :: !Char -> !Maybe Char -> CSVSettings

- Data.CSV.Conduit: [csvQuoteChar] :: CSVSettings -> !(Maybe Char)

+ Data.CSV.Conduit: [csvQuoteChar] :: CSVSettings -> !Maybe Char

- Data.CSV.Conduit: intoCSV :: (CSV s r, (MonadThrow m)) => CSVSettings -> ConduitM s r m ()

+ Data.CSV.Conduit: intoCSV :: (CSV s r, MonadThrow m) => CSVSettings -> ConduitM s r m ()

- Data.CSV.Conduit: writeCSVFile :: (CSV ByteString a) => CSVSettings -> FilePath -> IOMode -> [a] -> IO ()

+ Data.CSV.Conduit: writeCSVFile :: CSV ByteString a => CSVSettings -> FilePath -> IOMode -> [a] -> IO ()

- Data.CSV.Conduit.Types: CSVSettings :: !Char -> !(Maybe Char) -> CSVSettings

+ Data.CSV.Conduit.Types: CSVSettings :: !Char -> !Maybe Char -> CSVSettings

- Data.CSV.Conduit.Types: [csvQuoteChar] :: CSVSettings -> !(Maybe Char)

+ Data.CSV.Conduit.Types: [csvQuoteChar] :: CSVSettings -> !Maybe Char

Files

changelog.md +3/−0
csv-conduit.cabal +1/−1
src/Data/CSV/Conduit.hs +4/−4
src/Data/CSV/Conduit/Conversion.hs +5/−0
src/Data/CSV/Conduit/Conversion/Internal.hs +2/−2

changelog.md view

@@ -1,3 +1,6 @@+0.7.1.0+* Add MonadFail instance for Parser. [PR 38](https://github.com/ozataman/csv-conduit/pull/38)+ 0.7.0.0 * BREAKING: Switch from partial Monoid instance on Parser to total Semigroup instance. * Compatibility with GHC 8.4.x/base-4.11.1.0

csv-conduit.cabal view

@@ -1,5 +1,5 @@ Name:                csv-conduit-Version:             0.7.0.0+Version:             0.7.1.0 Synopsis:            A flexible, fast, conduit-based CSV parser library for Haskell. Homepage:            http://github.com/ozataman/csv-conduit License:             BSD3

src/Data/CSV/Conduit.hs view

@@ -59,7 +59,7 @@ import qualified Data.Vector                        as V import qualified Data.Vector.Generic                as GV import qualified Data.Vector.Generic.Mutable        as GMV-import           Data.Void                          (Void)+import           Data.Void                           as Void import           System.IO ------------------------------------------------------------------------------- import           Data.CSV.Conduit.Conversion        (FromNamedRecord (..),@@ -327,7 +327,7 @@     csvConvert' :: ConduitM s a (CatchT (ST s1)) ()     csvConvert' = intoCSV set     growthFactor = 10-    sink :: ConduitM a Void (ExceptT SomeException (ST s1)) (v a)+    sink :: ConduitM a Void.Void (ExceptT SomeException (ST s1)) (v a)     sink = sinkVector growthFactor     pipeline :: ExceptT SomeException (ST s1) (v a)     pipeline = runConduit (src .| csvConvert .| sink)@@ -391,7 +391,7 @@     -- ^ A raw stream data source. Ex: 'sourceFile inFile'     -> ConduitM a b m ()     -- ^ A transforming conduit-    -> ConduitM s' Void m ()+    -> ConduitM s' Void.Void m ()     -- ^ A raw stream data sink. Ex: 'sinkFile outFile'     -> m () transformCSV set = transformCSV' set set@@ -419,7 +419,7 @@     -- ^ A raw stream data source. Ex: 'sourceFile inFile'     -> ConduitM a b m ()     -- ^ A transforming conduit-    -> ConduitM s' Void m ()+    -> ConduitM s' Void.Void m ()     -- ^ A raw stream data sink. Ex: 'sinkFile outFile'     -> m () transformCSV' setIn setOut source c sink = runConduit $

src/Data/CSV/Conduit/Conversion.hs view

@@ -751,6 +751,11 @@     {-# INLINE (>>=) #-}     return a = Parser $ \_kf ks -> ks a     {-# INLINE return #-}++#if MIN_VERSION_base(4,13,0)+instance MonadFail Parser where+#endif+     fail msg = Parser $ \kf _ks -> kf msg     {-# INLINE fail #-}

src/Data/CSV/Conduit/Conversion/Internal.hs view

@@ -12,7 +12,7 @@ import           Data.Int import           Data.Word -import           Data.CSV.Conduit.Monoid        ((<>))+import           Data.CSV.Conduit.Monoid        as Monoid ((<>))  ------------------------------------------------------------------------ -- Integers@@ -46,7 +46,7 @@     :: Word64 -> Builder #-} {-# NOINLINE formatDecimal #-} formatDecimal i-    | i < 0     = minus <>+    | i < 0     = minus Monoid.<>                   if i <= -128                   then formatPositive (-(i `quot` 10)) <> digit (-(i `rem` 10))                   else formatPositive (-i)