Skip to content

Commit b1d58b5

Browse files
Bump store-core version
2 parents 9b93cc3 + c7d6e5a commit b1d58b5

File tree

4 files changed

+10
-14
lines changed

4 files changed

+10
-14
lines changed

postgres-wire.cabal

+1-1
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ library
5252
, stm
5353
, tls
5454
, cryptonite
55-
, store-core
55+
, store-core >= 0.4.1 && < 0.5
5656
, scientific
5757
, uuid
5858
default-language: Haskell2010

src/Database/PostgreSQL/Driver/Settings.hs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
module Database.PostgreSQL.Driver.Settings
1+
module Database.PostgreSQL.Driver.Settings
22
( ConnectionSettings(..)
3-
, TlsMode
3+
, TlsMode (..)
44
, defaultConnectionSettings
55
) where
66

src/Database/PostgreSQL/Protocol/Store/Decode.hs

+6-9
Original file line numberDiff line numberDiff line change
@@ -33,15 +33,14 @@ runDecodeIO (Decode dec) bs = do
3333
embedIO :: IO a -> Decode a
3434
embedIO action = Decode $ Peek $ \_ ptr -> do
3535
v <- action
36-
return (ptr, v)
36+
pure (PeekResult ptr v)
3737

3838
{-# INLINE prim #-}
3939
prim :: Int -> (Ptr Word8 -> IO a) -> Decode a
4040
prim len f = Decode $ Peek $ \ps ptr -> do
4141
!v <- f ptr
4242
let !newPtr = ptr `plusPtr` len
43-
return (newPtr, v)
44-
-- return $ PeekResult newPtr v
43+
pure (PeekResult newPtr v)
4544

4645
-- Public
4746

@@ -54,16 +53,14 @@ getByteString :: Int -> Decode B.ByteString
5453
getByteString len = Decode $ Peek $ \ps ptr -> do
5554
bs <- B.packCStringLen (castPtr ptr, len)
5655
let !newPtr = ptr `plusPtr` len
57-
-- return $ PeekResult newPtr bs
58-
return (newPtr, bs)
56+
pure (PeekResult newPtr bs)
5957

6058
{-# INLINE getByteStringNull #-}
6159
getByteStringNull :: Decode B.ByteString
6260
getByteStringNull = Decode $ Peek $ \ps ptr -> do
6361
bs <- B.packCString (castPtr ptr)
6462
let !newPtr = ptr `plusPtr` (B.length bs + 1)
65-
-- return $ PeekResult newPtr bs
66-
return (newPtr, bs)
63+
pure (PeekResult newPtr bs)
6764

6865
{-# INLINE getWord8 #-}
6966
getWord8 :: Decode Word8
@@ -95,12 +92,12 @@ getInt64BE = fromIntegral <$> getWord64BE
9592

9693
{-# INLINE getFloat32BE #-}
9794
getFloat32BE :: Decode Float
98-
getFloat32BE = prim 4 $ \ptr -> byteSwap32 <$> peek (castPtr ptr)
95+
getFloat32BE = prim 4 $ \ptr -> byteSwap32 <$> peek (castPtr ptr)
9996
>>= wordToFloat
10097

10198
{-# INLINE getFloat64BE #-}
10299
getFloat64BE :: Decode Double
103-
getFloat64BE = prim 8 $ \ptr -> byteSwap64 <$> peek (castPtr ptr)
100+
getFloat64BE = prim 8 $ \ptr -> byteSwap64 <$> peek (castPtr ptr)
104101
>>= wordToFloat
105102

106103
{-# INLINE wordToFloat #-}

stack.yaml

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# This file was automatically generated by 'stack init'
22
#
3-
resolver: lts-8.0
3+
resolver: lts-8.21
44

55
packages:
66
- '.'
@@ -9,7 +9,6 @@ packages:
99
extra-deps:
1010
- socket-0.8.0.0
1111
- socket-unix-0.2.0.0
12-
- store-core-0.3
1312

1413
# Override default flag values for local packages and extra-deps
1514
flags: {}

0 commit comments

Comments
 (0)