Skip to content

Commit 69ba0e9

Browse files
authored
Merge pull request #9 from slamdata/compiler/0.12
Compiler/0.12
2 parents 645039f + e7c5952 commit 69ba0e9

File tree

4 files changed

+14
-9
lines changed

4 files changed

+14
-9
lines changed

.travis.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,13 @@ language: node_js
22
dist: trusty
33
sudo: required
44
node_js: stable
5+
env:
6+
- PATH=$HOME/purescript:$PATH
57
install:
8+
- TAG=$(wget -q -O - https://github.com/purescript/purescript/releases/latest --server-response --max-redirect 0 2>&1 | sed -n -e 's/.*Location:.*tag\///p')
9+
- wget -O $HOME/purescript.tar.gz https://github.com/purescript/purescript/releases/download/$TAG/linux64.tar.gz
10+
- tar -xvf $HOME/purescript.tar.gz -C $HOME/
11+
- chmod a+x $HOME/purescript
612
- npm install -g bower
713
- npm install
814
- bower install

bower.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,6 @@
1515
"package.json"
1616
],
1717
"dependencies": {
18-
"purescript-aff": "^4.0.0"
18+
"purescript-aff": "^5.0.0"
1919
}
2020
}

package.json

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,8 @@
55
"build": "pulp build -- --censor-lib --strict"
66
},
77
"devDependencies": {
8-
"pulp": "^11.0.0",
9-
"purescript": "^0.11.1",
10-
"purescript-psa": "^0.5.0",
11-
"rimraf": "^2.5.4"
8+
"pulp": "^12.2.0",
9+
"purescript-psa": "^0.6.0",
10+
"rimraf": "^2.6.2"
1211
}
1312
}

src/Control/Monad/Fork/Class.purs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ module Control.Monad.Fork.Class where
1818

1919
import Prelude hiding (join)
2020

21-
import Control.Monad.Aff as Aff
21+
import Effect.Aff as Aff
2222
import Control.Monad.Error.Class (class MonadThrow, class MonadError)
2323
import Control.Monad.Reader.Trans (ReaderT(..), runReaderT)
2424
import Control.Monad.Trans.Class (lift)
@@ -45,7 +45,7 @@ class (Monad m, Functor f) ⇐ MonadFork f m | m → f where
4545
fork a. m a m (f a)
4646
join a. f a m a
4747

48-
instance monadForkAffMonadFork (Aff.Fiber eff) (Aff.Aff eff) where
48+
instance monadForkAffMonadFork Aff.Fiber Aff.Aff where
4949
suspend = Aff.suspendAff
5050
fork = Aff.forkAff
5151
join = Aff.joinFiber
@@ -69,7 +69,7 @@ instance monadForkReaderT ∷ MonadFork f m ⇒ MonadFork f (ReaderT r m) where
6969
class (MonadFork f m, MonadThrow e m) MonadKill e f m | m e f where
7070
kill a. e f a m Unit
7171

72-
instance monadKillAffMonadKill Aff.Error (Aff.Fiber eff) (Aff.Aff eff) where
72+
instance monadKillAffMonadKill Aff.Error Aff.Fiber Aff.Aff where
7373
kill = Aff.killFiber
7474

7575
instance monadKillReaderTMonadKill e f m MonadKill e f (ReaderT r m) where
@@ -101,7 +101,7 @@ class (MonadKill e f m, MonadError e m) ⇐ MonadBracket e f m | m → e f where
101101
uninterruptible a. m a m a
102102
never a. m a
103103

104-
instance monadBracketAffMonadBracket Aff.Error (Aff.Fiber eff) (Aff.Aff eff) where
104+
instance monadBracketAffMonadBracket Aff.Error Aff.Fiber Aff.Aff where
105105
bracket acquire release run =
106106
Aff.generalBracket acquire
107107
{ completed: release <<< Completed

0 commit comments

Comments
 (0)