summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorlambda_foo <>2017-11-14 03:41:00 (GMT)
committerhdiff <hdiff@hdiff.luite.com>2017-11-14 03:41:00 (GMT)
commit49936f08db63c65c610532e2845ca294c130c722 (patch)
tree8841de65fe4ee2b5f031f220237ba77ff89a7ab6
parent3b41219bd5aa7c12830695bab14a80aae73e7b69 (diff)
version 1.1.2.1HEAD1.1.2.1master
-rw-r--r--Changes.md4
-rw-r--r--README.markdown10
-rw-r--r--riak.cabal14
-rw-r--r--src/Network/Riak/Escape.hs10
-rw-r--r--src/Network/Riak/Functions.hs8
5 files changed, 23 insertions, 23 deletions
diff --git a/Changes.md b/Changes.md
index b2fa02a..187f15f 100644
--- a/Changes.md
+++ b/Changes.md
@@ -1,3 +1,7 @@
+* 1.1.2.1
+ - PR #90. Add GHC 8.2.1 support
+ - Bump time upper bound from <1.7 to <1.9
+ - Bump aeson upper bound from <1.2 to <1.3
* 1.1.2.0
- Fixes issue where exceptions were not handled properly with many threads (https://github.com/markhibberd/riak-haskell-client/pull/76)
- Add / delete indexes
diff --git a/README.markdown b/README.markdown
index d8d8f11..0c17504 100644
--- a/README.markdown
+++ b/README.markdown
@@ -14,15 +14,15 @@ We are happy to receive bug reports, fixes, documentation enhancements,
and other improvements.
Please report bugs via the
-[github issue tracker](http://github.com/markhibberd/riak-haskell-client/issues).
+[github issue tracker](http://github.com/riak-haskell-client/riak-haskell-client/issues).
-Master [git repository](http://github.com/markhibberd/riak-haskell-client):
+Master [git repository](http://github.com/riak-haskell-client/riak-haskell-client):
-* `git clone git://github.com/markhibberd/riak-haskell-client.git`
+* `git clone git://github.com/riak-haskell-client/riak-haskell-client.git`
-Note the official repo is now <https://github.com/markhibberd/riak-haskell-client>.
+Note the official repo is now <https://github.com/riak-haskell-client/riak-haskell-client>.
# Build
-[![Build Status](https://travis-ci.org/markhibberd/riak-haskell-client.svg)](https://travis-ci.org/markhibberd/riak-haskell-client)
+[![Build Status](https://travis-ci.org/riak-haskell-client/riak-haskell-client.svg)](https://travis-ci.org/riak-haskell-client/riak-haskell-client)
diff --git a/riak.cabal b/riak.cabal
index 3aec31b..563d2f9 100644
--- a/riak.cabal
+++ b/riak.cabal
@@ -1,5 +1,5 @@
name: riak
-version: 1.1.2.0
+version: 1.1.2.1
synopsis: A Haskell client for the Riak decentralized data store
description:
A Haskell client library for the Riak decentralized data
@@ -31,7 +31,8 @@ description:
[Network.Riak.CRDT] CRDT operations.
-homepage: http://github.com/markhibberd/riak-haskell-client
+homepage: http://github.com/riak-haskell-client/riak-haskell-client
+Bug-reports: http://github.com/riak-haskell-client/riak-haskell-client/issues
license: OtherLicense
license-file: LICENSE
author: Bryan O'Sullivan <bos@serpentine.com>
@@ -48,7 +49,7 @@ cabal-version: >=1.8
source-repository head
type: git
- location: https://github.com:markhibberd/riak-haskell-client.git
+ location: https://github.com:riak-haskell-client/riak-haskell-client.git
flag debug
description: allow debug logging
@@ -99,10 +100,11 @@ library
Network.Riak.Tag
build-depends:
- aeson >= 0.8 && < 1.2,
+ aeson >= 0.8 && < 1.3,
async >= 2.0.0.0 && < 2.2,
attoparsec >= 0.12.1.6 && < 0.14,
base >= 3 && < 5,
+ bifunctors >= 4.2 && < 6,
binary,
blaze-builder >= 0.3 && <= 0.5,
bytestring,
@@ -125,8 +127,8 @@ library
semigroups >= 0.16,
stm == 2.4.*,
text == 1.2.*,
- time >= 1.4.2 && < 1.7,
- vector >= 0.10.12.3 && < 0.12,
+ time >= 1.4.2 && < 1.9,
+ vector >= 0.10.12.3 && < 0.13,
unordered-containers >= 0.2.5
diff --git a/src/Network/Riak/Escape.hs b/src/Network/Riak/Escape.hs
index 7af9c63..5730c54 100644
--- a/src/Network/Riak/Escape.hs
+++ b/src/Network/Riak/Escape.hs
@@ -4,7 +4,7 @@
-- Module: Network.Riak.Connection
-- Copyright: (c) 2011 MailRank, Inc.
-- License: Apache
--- Maintainer: Mark Hibberd <mark@hibberd.id.au>, Nathan Hunter <nhunter@janrain.com>
+-- Maintainer: Tim McGilchrist <timmcgil@gmail.com>, Mark Hibberd <mark@hibberd.id.au>, Nathan Hunter <nhunter@janrain.com>
-- Stability: experimental
-- Portability: portable
--
@@ -36,7 +36,7 @@ import Data.Monoid (mappend, mempty)
#endif
import Data.Text (Text)
import Data.Word (Word8)
-import Network.Riak.Functions (mapEither)
+import Data.Bifunctor (second, first)
import qualified Data.ByteString as B
import qualified Data.ByteString.Lazy as L
import qualified Data.ByteString.Unsafe as B
@@ -78,7 +78,7 @@ instance Escape Text where
escape = escape . T.encodeUtf8
{-# INLINE escape #-}
unescape' lbs = case AL.parse (toByteString <$> unescapeBS) lbs of
- AL.Done _ bs -> mapEither show id $ T.decodeUtf8' bs
+ AL.Done _ bs -> first show $ T.decodeUtf8' bs
AL.Fail _ _ err -> Left err
{-# INLINE unescape' #-}
@@ -86,14 +86,14 @@ instance Escape TL.Text where
escape = escape . TL.encodeUtf8
{-# INLINE escape #-}
unescape' lbs = case AL.parse (toLazyByteString <$> unescapeBS) lbs of
- AL.Done _ bs -> mapEither show id $ TL.decodeUtf8' bs
+ AL.Done _ bs -> first show $ TL.decodeUtf8' bs
AL.Fail _ _ err -> Left err
{-# INLINE unescape' #-}
instance Escape [Char] where
escape = escape . T.encodeUtf8 . T.pack
{-# INLINE escape #-}
- unescape' = mapEither id T.unpack . unescape'
+ unescape' = second T.unpack . unescape'
{-# INLINE unescape' #-}
-- | URL-escape a byte from a bytestring.
diff --git a/src/Network/Riak/Functions.hs b/src/Network/Riak/Functions.hs
index e0dbdf3..b1fd371 100644
--- a/src/Network/Riak/Functions.hs
+++ b/src/Network/Riak/Functions.hs
@@ -2,7 +2,7 @@
-- Module: Network.Riak.Functions
-- Copyright: (c) 2011 MailRank, Inc.
-- License: Apache
--- Maintainer: Mark Hibberd <mark@hibberd.id.au>, Nathan Hunter <nhunter@janrain.com>
+-- Maintainer: Tim McGilchrist <timmcgil@gmail.com>, Mark Hibberd <mark@hibberd.id.au>, Nathan Hunter <nhunter@janrain.com>
-- Stability: experimental
-- Portability: portable
--
@@ -12,7 +12,6 @@ module Network.Riak.Functions
(
strict
, lazy
- , mapEither
) where
import qualified Data.ByteString as B
@@ -27,8 +26,3 @@ lazy :: B.ByteString -> L.ByteString
lazy s | B.null s = L.Empty
| otherwise = L.Chunk s L.Empty
{-# INLINE lazy #-}
-
-mapEither :: (a -> c) -> (b -> d) -> Either a b -> Either c d
-mapEither f _ (Left l) = Left (f l)
-mapEither _ g (Right r) = Right (g r)
-{-# INLINE mapEither #-}