Merge branch 'master' into 0.3

* master:
  Remove Bug from the Unit instance of RowParser
  Update the "list-t" bounds
This commit is contained in:
Nikita Volkov 2014-11-29 20:23:58 +03:00
commit 93a1185a91
3 changed files with 3 additions and 2 deletions

View File

@ -22,6 +22,7 @@ install:
cabal install "text == 1.0.*";
cabal install "attoparsec == 0.10.*";
cabal install "time == 1.4.*";
cabal install "list-t == 0.2.*";
fi;
# Work around the "haskell-src-exts" implicit dependency:
- cabal install happy

View File

@ -105,7 +105,7 @@ library
bytestring == 0.10.*,
text >= 1.0 && < 1.3,
-- control:
list-t >= 0.2.4 && < 0.3,
list-t >= 0.2.4 && < 0.4,
monad-control == 0.3.*,
transformers-base == 0.4.*,
-- errors:

View File

@ -14,7 +14,7 @@ instance RowParser b () where
parseRow row =
if Vector.null row
then Right ()
else $bug "Not an empty row"
else Left "Not an empty row"
instance Backend.Mapping b v => RowParser b (Identity v) where
parseRow row = do