Merge
commit9ad54b1829fda597e6916e4354f8cc4f5a8cce9b
authorBryan O'Sullivan <bos@serpentine.com>
dateWed 14 May 2014, 17:03 (12 years ago)
parent287a2fc08a4477
.hgtags+1
@@ -47,3 +47,4 @@ ec23283e88c00af34c3144a8775ca4358daea3f7 0.10.4.0
47476f4b317a12acdd05d67fd9ec55d3defaf37a01eb 0.11.1.0
484848809d7716468fe2bbc47b191b1d64358daaf6d1 0.11.2.1
4949856a772f83a6e382bbcfe53e221a5a92623b107c 0.11.3.0
50+a3c7a521fd58595d6a470ab890cc54a80dd45bd7 0.11.3.1
attoparsec.cabal+2−2
@@ -1,5 +1,5 @@
11name: attoparsec
2−version: 0.11.3.0
2+version: 0.11.3.1
33license: BSD3
44license-file: LICENSE
55category: Text, Parsing
@@ -44,7 +44,7 @@ library
4444 containers,
4545 deepseq,
4646 text >= 0.11.3.1,
47− scientific >= 0.2
47+ scientific >= 0.2 && < 0.3
4848
4949 exposed-modules: Data.Attoparsec
5050 Data.Attoparsec.ByteString
tests/QC/ByteString.hs+1−1
@@ -67,7 +67,7 @@ skipWhile w s =
6767takeCount (Positive k) s =
6868 case maybeP (P.take k) s of
6969 Nothing -> fromIntegral k > L.length s
70− Just s' -> fromIntegral k <= L.length s
70+ Just _ -> fromIntegral k <= L.length s
7171
7272takeWhile w s =
7373 let (h,t) = L.span (==w) s