upgrade to curryer-rpc 0.3.8 and fix deserialiseOnly naming conflict

agentm · Dec 21, 2024 · 1690baf · 1690baf
1 parent a07f629
commit 1690baf
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/project-m36.cabal b/project-m36.cabal
@@ -91,7 +91,7 @@ Library
                   cryptohash-sha256,
                   text-manipulate >= 0.2.0.1 && < 0.4,
                   winery >= 1.4,
-                  curryer-rpc>=0.3.7,
+                  curryer-rpc>=0.3.8,
                   network,
                   async,
                   vector-instances,

diff --git a/src/lib/ProjectM36/Cache/Tuple.hs b/src/lib/ProjectM36/Cache/Tuple.hs
@@ -153,16 +153,16 @@ readTupleStream h = SD.unCross $ do
   let readTupleBlock (offset', byteLength) = liftIO $ do
 --        print ("readTupleBlock", offset', byteLength)
         hSeek h AbsoluteSeek (fromIntegral offset')
-        tuples <- deserialiseOnly <$> BS.hGet h (fromIntegral byteLength)
+        tuples <- deserialiseOnly' <$> BS.hGet h (fromIntegral byteLength)
         case tuples of
           Left err -> throw err
           Right tuples' -> do
 --            print ("readTupleBlock", tuples')
             pure $ SP.fromList tuples'
   SD.mkCross $ SP.concatMapM readTupleBlock (SP.fromList (V.toList (blockSizes tupleCacheInfo)))
 
-deserialiseOnly :: forall s. Serialise s => BS.ByteString -> Either WineryException s
-deserialiseOnly bytes = do
+deserialiseOnly' :: forall s. Serialise s => BS.ByteString -> Either WineryException s
+deserialiseOnly' bytes = do
   dec <- getDecoder (schema (Proxy :: Proxy s))
   pure (evalDecoder dec bytes)