Skip to content

Commit 39479c2

Browse files
authored
Merge pull request #5 from purescript/ps-0.11
Update for PureScript 0.11
2 parents 988fae2 + b388f8a commit 39479c2

8 files changed

Lines changed: 46 additions & 57 deletions

File tree

.eslintrc.json

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
{
2+
"parserOptions": {
3+
"ecmaVersion": 5
4+
},
5+
"extends": "eslint:recommended",
6+
"env": {
7+
"commonjs": true
8+
},
9+
"rules": {
10+
"strict": [2, "global"],
11+
"block-scoped-var": 2,
12+
"consistent-return": 2,
13+
"eqeqeq": [2, "smart"],
14+
"guard-for-in": 2,
15+
"no-caller": 2,
16+
"no-extend-native": 2,
17+
"no-loop-func": 2,
18+
"no-new": 2,
19+
"no-param-reassign": 2,
20+
"no-return-assign": 2,
21+
"no-unused-expressions": 2,
22+
"no-use-before-define": 2,
23+
"radix": [2, "always"],
24+
"indent": [2, 2],
25+
"quotes": [2, "double"],
26+
"semi": [2, "always"]
27+
}
28+
}

.gitignore

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
/.*
22
!/.gitignore
3-
!/.jscsrc
4-
!/.jshintrc
3+
!/.eslintrc.json
54
!/.travis.yml
65
/bower_components/
76
/node_modules/

.jscsrc

Lines changed: 0 additions & 17 deletions
This file was deleted.

.jshintrc

Lines changed: 0 additions & 20 deletions
This file was deleted.

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
language: node_js
22
dist: trusty
33
sudo: required
4-
node_js: 6
4+
node_js: stable
55
env:
66
- PATH=$HOME/purescript:$PATH
77
install:

bower.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,6 @@
1717
"package.json"
1818
],
1919
"dependencies": {
20-
"purescript-prelude": "^2.1.0"
20+
"purescript-prelude": "^3.0.0"
2121
}
2222
}

package.json

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,12 @@
22
"private": true,
33
"scripts": {
44
"clean": "rimraf output && rimraf .pulp-cache",
5-
"build": "jshint src && jscs src && pulp build --censor-lib --strict"
5+
"build": "eslint src && pulp build -- --censor-lib --strict"
66
},
77
"devDependencies": {
8-
"jscs": "^2.8.0",
9-
"jshint": "^2.9.1",
10-
"pulp": "^9.0.1",
11-
"purescript-psa": "^0.3.9",
12-
"rimraf": "^2.5.0"
8+
"eslint": "^3.17.1",
9+
"pulp": "^10.0.4",
10+
"purescript-psa": "^0.5.0-rc.1",
11+
"rimraf": "^2.6.1"
1312
}
1413
}

src/Data/Function/Uncurried.purs

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,37 +3,37 @@ module Data.Function.Uncurried where
33
import Data.Unit (Unit)
44

55
-- | A function of zero arguments
6-
foreign import data Fn0 :: * -> *
6+
foreign import data Fn0 :: Type -> Type
77

88
-- | A function of one argument
99
type Fn1 a b = a -> b
1010

1111
-- | A function of two arguments
12-
foreign import data Fn2 :: * -> * -> * -> *
12+
foreign import data Fn2 :: Type -> Type -> Type -> Type
1313

1414
-- | A function of three arguments
15-
foreign import data Fn3 :: * -> * -> * -> * -> *
15+
foreign import data Fn3 :: Type -> Type -> Type -> Type -> Type
1616

1717
-- | A function of four arguments
18-
foreign import data Fn4 :: * -> * -> * -> * -> * -> *
18+
foreign import data Fn4 :: Type -> Type -> Type -> Type -> Type -> Type
1919

2020
-- | A function of five arguments
21-
foreign import data Fn5 :: * -> * -> * -> * -> * -> * -> *
21+
foreign import data Fn5 :: Type -> Type -> Type -> Type -> Type -> Type -> Type
2222

2323
-- | A function of six arguments
24-
foreign import data Fn6 :: * -> * -> * -> * -> * -> * -> * -> *
24+
foreign import data Fn6 :: Type -> Type -> Type -> Type -> Type -> Type -> Type -> Type
2525

2626
-- | A function of seven arguments
27-
foreign import data Fn7 :: * -> * -> * -> * -> * -> * -> * -> * -> *
27+
foreign import data Fn7 :: Type -> Type -> Type -> Type -> Type -> Type -> Type -> Type -> Type
2828

2929
-- | A function of eight arguments
30-
foreign import data Fn8 :: * -> * -> * -> * -> * -> * -> * -> * -> * -> *
30+
foreign import data Fn8 :: Type -> Type -> Type -> Type -> Type -> Type -> Type -> Type -> Type -> Type
3131

3232
-- | A function of nine arguments
33-
foreign import data Fn9 :: * -> * -> * -> * -> * -> * -> * -> * -> * -> * -> *
33+
foreign import data Fn9 :: Type -> Type -> Type -> Type -> Type -> Type -> Type -> Type -> Type -> Type -> Type
3434

3535
-- | A function of ten arguments
36-
foreign import data Fn10 :: * -> * -> * -> * -> * -> * -> * -> * -> * -> * -> * -> *
36+
foreign import data Fn10 :: Type -> Type -> Type -> Type -> Type -> Type -> Type -> Type -> Type -> Type -> Type -> Type
3737

3838
-- | Create a function of no arguments
3939
foreign import mkFn0 :: forall a. (Unit -> a) -> Fn0 a

0 commit comments

Comments
 (0)