on master help sign in
more updates for ever-changing deferred-folds library
commit4231471315a5ba54afa654e05972b1c805edfffa authorAgentM <agentm@themactionfaction.com> dateTue 18 Sep 2018, 17:11 (8 years ago) parentb5c0070
3 files changed+5−5
project-m36.cabal+1−1 src/lib/ProjectM36/Arbitrary.hs+1−1 src/lib/ProjectM36/Sessions.hs+3−3
project-m36.cabal+1−1
@@ -96,7 +96,7 @@ Library
9696 ProjectM36.FileLock,
9797 ProjectM36.FSType,
9898 ProjectM36.Arbitrary
99− GHC-Options: -Wall -rdynamic -threaded
99+ GHC-Options: -Wall -rdynamic
100100 if os(windows)
101101 Build-Depends: Win32 >= 2.5.4.1
102102 Other-Modules: ProjectM36.Win32Handle
src/lib/ProjectM36/Arbitrary.hs+1−1
@@ -10,7 +10,7 @@ import ProjectM36.Attribute (atomType)
1010import ProjectM36.DataConstructorDef as DCD
1111import ProjectM36.DataTypes.Interval
1212import qualified Data.Vector as V
13−import Data.Text (Text,pack)
13+import Data.Text (Text)
1414import Test.QuickCheck
1515import Test.QuickCheck.Instances ()
1616import qualified Data.ByteString.Char8 as B
src/lib/ProjectM36/Sessions.hs+3−3
@@ -16,21 +16,21 @@ import ProjectM36.Relation
1616import ProjectM36.Error
1717import qualified Data.UUID as U
1818import qualified Control.Foldl as Foldl
19−import qualified DeferredFolds.UnfoldM as UnfoldM
19+import qualified DeferredFolds.UnfoldlM as UF
2020
2121type Sessions = StmMap.Map SessionId Session
2222
2323--from https://github.com/nikita-volkov/stm-containers/blob/master/test/Main/MapTests.hs
2424stmMapToList :: StmMap.Map k v -> STM [(k, v)]
2525#if MIN_VERSION_stm_containers(1,0,0)
26−stmMapToList = UnfoldM.foldM (Foldl.generalize Foldl.list) . StmMap.unfoldM
26+stmMapToList = UF.foldM (Foldl.generalize Foldl.list) . StmMap.unfoldlM
2727#else
2828stmMapToList = ListT.fold (\l -> return . (:l)) [] . StmMap.stream
2929#endif
3030
3131stmSetToList :: StmSet.Set v -> STM [v]
3232#if MIN_VERSION_stm_containers(1,0,0)
33−stmSetToList = UnfoldM.foldM (Foldl.generalize Foldl.list) . StmSet.unfoldM
33+stmSetToList = UF.foldM (Foldl.generalize Foldl.list) . StmSet.unfoldlM
3434#else
3535stmSetToList = ListT.fold (\l -> return . (:l)) [] . StmSet.stream
3636#endif