Skip to content

Commit c19a792

Browse files
kritzcreekkritzcreek
authored
Merge branch '0.12.0-dev' into master
2 parents 6e19036 + 14227c7 commit c19a792

83 files changed

Lines changed: 1632 additions & 703 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎CONTRIBUTORS.md‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,7 @@ If you would prefer to use different terms, please use the section below instead
8686
| [@phiggins](https://github.com/phiggins) | Pete Higgins | [MIT license](http://opensource.org/licenses/MIT) |
8787
| [@philopon](https://github.com/philopon) | Hirotomo Moriwaki | [MIT license](http://opensource.org/licenses/MIT) |
8888
| [@pseudonom](https://github.com/pseudonom) | Eric Easley | [MIT license](http://opensource.org/licenses/MIT) |
89+
| [@quesebifurcan](https://github.com/quesebifurcan) | Fredrik Wallberg | [MIT license](http://opensource.org/licenses/MIT) |
8990
| [@rightfold](https://github.com/rightfold) | rightfold | [MIT license](https://opensource.org/licenses/MIT) |
9091
| [@robdaemon](https://github.com/robdaemon) | Robert Roland | [MIT license](http://opensource.org/licenses/MIT) |
9192
| [@RossMeikleham](https://github.com/RossMeikleham) | Ross Meikleham | [MIT license](http://opensource.org/licenses/MIT) |
@@ -111,9 +112,11 @@ If you would prefer to use different terms, please use the section below instead
111112
| [@vkorablin](https://github.com/vkorablin) | Vladimir Korablin | MIT license |
112113
| [@zudov](https://github.com/zudov) | Konstantin Zudov | [MIT license](http://opensource.org/licenses/MIT) |
113114
| [@b123400](https://github.com/b123400) | b123400 | [MIT license](https://opensource.org/licenses/MIT) |
115+
| [@kcsongor](https://github.com/kcsongor) | Csongor Kiss | [MIT license](http://opensource.org/licenses/MIT) |
114116
| [@drets](https://github.com/drets) | Dmytro Rets | [MIT license](http://opensource.org/licenses/MIT) |
115117
| [@bjornmelgaaard](https://github.com/BjornMelgaard) | Sergey Homa | [MIT license](http://opensource.org/licenses/MIT) |
116118
| [@thimoteus](https://github.com/Thimoteus) | thimoteus | [MIT license](http://opensource.org/licenses/MIT) |
119+
| [@sloosch](https://github.com/sloosch) | Simon Looschen | [MIT license](http://opensource.org/licenses/MIT) |
117120

118121
### Contributors using Modified Terms
119122

‎app/Command/Docs/Tags.hs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ tags = map (first T.unpack) . concatMap dtags . P.exportedDeclarations
1414
dtags (P.ExternDeclaration (ss, _) ident _) = [(P.showIdent ident, pos ss)]
1515
dtags (P.TypeSynonymDeclaration (ss, _) name _ _) = [(P.runProperName name, pos ss)]
1616
dtags (P.TypeClassDeclaration (ss, _) name _ _ _ _) = [(P.runProperName name, pos ss)]
17-
dtags (P.TypeInstanceDeclaration (ss, _) name _ _ _ _) = [(P.showIdent name, pos ss)]
17+
dtags (P.TypeInstanceDeclaration (ss, _) _ _ name _ _ _ _) = [(P.showIdent name, pos ss)]
1818
dtags (P.ExternKindDeclaration (ss, _) name) = [(P.runProperName name, pos ss)]
1919
dtags _ = []
2020
pos :: P.SourceSpan -> Int

‎bundle/build.sh‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ fi
3535
cp "$FULL_BIN" bundle/build/purescript
3636

3737
# Copy extra files to the staging directory
38-
cp scripts/* bundle/build/purescript/
3938
cp bundle/README bundle/build/purescript/
4039
cp LICENSE bundle/build/purescript/
4140
cp INSTALL.md bundle/build/purescript/

‎examples/docs/src/Proxy.purs‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
module Proxy where
2+
3+
foo :: @Int
4+
foo = @Int

‎examples/failing/2947.purs‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
-- @shouldFailWith ErrorParsingModule
2+
3+
module Main where
4+
5+
import Prelude
6+
7+
data Foo = Foo
8+
9+
instance eqFoo :: Eq Foo where
10+
eq _ _ = true

‎examples/failing/DeriveOldGeneric.purs‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
-- @shouldFailWith CannotDerive
2+
module DeriveOldGeneric where
3+
4+
import Prelude
5+
import Data.Generic
6+
import Control.Monad.Eff.Console (log)
7+
8+
newtype Foo = Foo Int
9+
10+
derive instance genericFoo :: Generic Foo

‎examples/failing/InstanceChainBothUnknownAndMatch.purs‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
-- @shouldFailWith NoInstanceFound
2+
module InstanceChains.BothUnknownAndMatch where
3+
4+
class Same l r o | l r -> o
5+
instance sameY :: Same t t @"Y" else instance sameN :: Same l r @"N"
6+
same :: forall l r o. Same l r o => l -> r -> @o
7+
same _ _ = @o
8+
9+
-- for label `u`, `t ~ Int` should be Unknown
10+
-- for label `m`, `Int ~ Int` should be a match
11+
-- together they should be Unknown
12+
example :: forall t. @t -> @_
13+
example _ = same @(u :: t, m :: Int) @(u :: Int, m :: Int)
14+

‎examples/failing/InstanceChainSkolemUnknownMatch.purs‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
-- @shouldFailWith NoInstanceFound
2+
module InstanceChainSkolemUnknownMatch where
3+
4+
class Same l r o | l r -> o
5+
instance sameY :: Same t t @"Y" else instance sameN :: Same l r @"N"
6+
same :: forall l r o. Same l r o => l -> r -> @o
7+
same _ _ = @o
8+
9+
-- shouldn't discard sameY as Apart
10+
example :: forall t. @t -> @_
11+
example _ = same @t @Int
12+

examples/warning/OverlappingInstances.purs renamed to examples/failing/OverlappingInstances.purs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
-- @shouldWarnWith OverlappingInstances
1+
-- @shouldFailWith OverlappingInstances
22
module Main where
33

44
class Test a where
@@ -10,7 +10,7 @@ instance testRefl :: Test a where
1010
instance testInt :: Test Int where
1111
test _ = 0
1212

13-
-- The OverlappingInstances instances warning only arises when there are two
13+
-- The OverlappingInstances instances error only arises when there are two
1414
-- choices for a dictionary, not when the instances are defined. So without
1515
-- `value` this module would not raise a warning.
1616
value :: Int

‎examples/failing/ProxyKind.purs‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
-- @shouldFailWith TypesDoNotUnify
2+
3+
module Main where
4+
5+
import Prelude
6+
import Control.Monad.Eff (Eff)
7+
8+
a :: @"a"
9+
a = @Int
10+
11+
main :: Eff _ _
12+
main = pure unit

0 commit comments

Comments
 (0)