summaryrefslogtreecommitdiff
path: root/P2P
diff options
context:
space:
mode:
authorGravatar Joey Hess <joeyh@joeyh.name>2016-12-10 11:12:18 -0400
committerGravatar Joey Hess <joeyh@joeyh.name>2016-12-10 11:12:18 -0400
commite242ea2be61ad30c5ecc1db4dfdf97de1265dee7 (patch)
treef862fbed8f67c8bf89b1de0425adc348730f56ca /P2P
parent824be5bfb8870052e5726238169f738441426da1 (diff)
fix build with old ghc
Diffstat (limited to 'P2P')
-rw-r--r--P2P/Annex.hs2
-rw-r--r--P2P/IO.hs2
2 files changed, 2 insertions, 2 deletions
diff --git a/P2P/Annex.hs b/P2P/Annex.hs
index b3db7513c..9971762f5 100644
--- a/P2P/Annex.hs
+++ b/P2P/Annex.hs
@@ -34,7 +34,7 @@ runFullProto :: RunMode -> P2PConnection -> Proto a -> Annex (Either String a)
runFullProto runmode conn = go
where
go :: RunProto Annex
- go (Pure v) = pure (Right v)
+ go (Pure v) = return (Right v)
go (Free (Net n)) = runNet conn go n
go (Free (Local l)) = runLocal runmode go l
diff --git a/P2P/IO.hs b/P2P/IO.hs
index bb93528a6..3e0999775 100644
--- a/P2P/IO.hs
+++ b/P2P/IO.hs
@@ -85,7 +85,7 @@ runNetProto :: P2PConnection -> Proto a -> IO (Either String a)
runNetProto conn = go
where
go :: RunProto IO
- go (Pure v) = pure (Right v)
+ go (Pure v) = return (Right v)
go (Free (Net n)) = runNet conn go n
go (Free (Local _)) = return (Left "unexpected annex operation attempted")