Skip to content

Commit 2dea57d

Browse files
oderskyodersky
committed
Fix rebase breakage
1 parent a0540a1 commit 2dea57d

12 files changed

+35
-42
lines changed

‎tests/neg-custom-args/captures/depfun-reach.check

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,3 @@
2727
| =>² refers to a fresh root capability in the type of value b
2828
|
2929
| longer explanation available when compiling with `-explain`
30-
-- Error: tests/neg-custom-args/captures/depfun-reach.scala:18:17 ------------------------------------------------------
31-
18 | : (xs: List[(X, () ->{io} Unit)]) => List[() ->{} Unit] = // error
32-
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
33-
|Separation failure: method foo's result type (xs: List[(X, () ->{io} Unit)]) => List[() -> Unit] hides parameter op.
34-
|The parameter needs to be annotated with @consume to allow this.

‎tests/neg-custom-args/captures/effect-swaps-explicit.check

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,21 +17,21 @@
1717
-- [E007] Type Mismatch Error: tests/neg-custom-args/captures/effect-swaps-explicit.scala:69:10 ------------------------
1818
69 | Future: fut ?=> // error, type mismatch
1919
| ^
20-
|Found: (contextual$9: boundary.Label[Result[Future[T^?]^?, E^?]^?]^) ?->{fr, async} Future[T^?]^{fr, contextual$9}
21-
|Required: (boundary.Label[Result[Future[T^?]^{fr, async}, E^?]]^) ?=> Future[T^?]^{fr, async}
20+
|Found: (contextual$9: boundary.Label[Result[Future[T^?]^?, E^?]^?]^?) ?->{fr, async} Future[T^?]^{fr, contextual$9}
21+
|Required: (boundary.Label[Result[Future[T^?]^?, E^?]]^) ?=> Future[T^?]^?
2222
|
2323
|where: ?=> refers to a fresh root capability created in method fail4 when checking argument to parameter body of method make
2424
| ^ refers to the universal root capability
2525
|
2626
|Note that reference contextual$9.type
27-
|cannot be included in outer capture set {fr, async}
27+
|cannot be included in outer capture set ?
2828
70 | fr.await.ok
2929
|
3030
| longer explanation available when compiling with `-explain`
3131
-- [E007] Type Mismatch Error: tests/neg-custom-args/captures/effect-swaps-explicit.scala:73:35 ------------------------
3232
73 | Result.make[Future[T], E]: lbl ?=> // error: type mismatch
3333
| ^
34-
|Found: (lbl: boundary.Label[Result[Future[T^?]^?, E^?]^?]^) ?->{fr, async} Future[T^?]^{fr, lbl}
34+
|Found: (lbl: boundary.Label[Result[Future[T^?]^?, E^?]^?]^?) ?->{fr, async} Future[T^?]^{fr, lbl}
3535
|Required: (boundary.Label[Result[Future[T], E]]^) ?=> Future[T]
3636
|
3737
|where: ?=> refers to a fresh root capability created in method fail5 when checking argument to parameter body of method make

‎tests/neg-custom-args/captures/effect-swaps.check

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,21 +17,21 @@
1717
-- [E007] Type Mismatch Error: tests/neg-custom-args/captures/effect-swaps.scala:69:10 ---------------------------------
1818
69 | Future: fut ?=> // error, type mismatch
1919
| ^
20-
|Found: (contextual$9: boundary.Label[Result[Future[T^?]^?, E^?]^?]^{cap.rd}) ?->{fr, async} Future[T^?]^{fr, contextual$9}
21-
|Required: (boundary.Label[Result[Future[T^?]^{fr, async}, E^?]]^{cap.rd}) ?=> Future[T^?]^{fr, async}
20+
|Found: (contextual$9: boundary.Label[Result[Future[T^?]^?, E^?]^?]^?) ?->{fr, async} Future[T^?]^{fr, contextual$9}
21+
|Required: (boundary.Label[Result[Future[T^?]^?, E^?]]^{cap.rd}) ?=> Future[T^?]^?
2222
|
2323
|where: ?=> refers to a fresh root capability created in method fail4 when checking argument to parameter body of method make
2424
| cap is the universal root capability
2525
|
2626
|Note that reference contextual$9.type
27-
|cannot be included in outer capture set {fr, async}
27+
|cannot be included in outer capture set ?
2828
70 | fr.await.ok
2929
|
3030
| longer explanation available when compiling with `-explain`
3131
-- [E007] Type Mismatch Error: tests/neg-custom-args/captures/effect-swaps.scala:73:35 ---------------------------------
3232
73 | Result.make[Future[T], E]: lbl ?=> // error: type mismatch
3333
| ^
34-
|Found: (lbl: boundary.Label[Result[Future[T^?]^?, E^?]^?]^{cap.rd}) ?->{fr, async} Future[T^?]^{fr, lbl}
34+
|Found: (lbl: boundary.Label[Result[Future[T^?]^?, E^?]^?]^?) ?->{fr, async} Future[T^?]^{fr, lbl}
3535
|Required: (boundary.Label[Result[Future[T], E]]^{cap.rd}) ?=> Future[T]
3636
|
3737
|where: ?=> refers to a fresh root capability created in method fail5 when checking argument to parameter body of method make

‎tests/neg-custom-args/captures/heal-tparam-cs.check

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
-- [E007] Type Mismatch Error: tests/neg-custom-args/captures/heal-tparam-cs.scala:10:23 -------------------------------
22
10 | val test1 = localCap { c => // error
33
| ^
4-
|Found: (c: Capp^) ->? () ->{c} Unit
4+
|Found: (c: Capp^?) ->? () ->{c} Unit
55
|Required: (c: Capp^) => () ->? Unit
66
|
77
|where: => refers to a fresh root capability created in value test1 when checking argument to parameter op of method localCap
@@ -16,7 +16,7 @@
1616
-- [E007] Type Mismatch Error: tests/neg-custom-args/captures/heal-tparam-cs.scala:15:13 -------------------------------
1717
15 | localCap { c => // error
1818
| ^
19-
| Found: (x$0: Capp^) ->? () ->{x$0} Unit
19+
| Found: (x$0: Capp^?) ->? () ->{x$0} Unit
2020
| Required: (c: Capp^) -> () => Unit
2121
|
2222
| where: => refers to a root capability associated with the result type of (c: Capp^): () => Unit
@@ -31,7 +31,7 @@
3131
-- [E007] Type Mismatch Error: tests/neg-custom-args/captures/heal-tparam-cs.scala:25:13 -------------------------------
3232
25 | localCap { c => // error
3333
| ^
34-
| Found: (x$0: Capp^{io}) ->? () ->{x$0} Unit
34+
| Found: (x$0: Capp^?) ->? () ->{x$0} Unit
3535
| Required: (c: Capp^{io}) -> () ->{net} Unit
3636
26 | (c1: Capp^{io}) => () => { c1.use() }
3737
27 | }

‎tests/neg-custom-args/captures/i15923.check

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,13 @@
11
-- [E007] Type Mismatch Error: tests/neg-custom-args/captures/i15923.scala:12:21 ---------------------------------------
22
12 | val leak = withCap(cap => mkId(cap)) // error
33
| ^^^^^^^^^^^^^^^^
4-
|Found: (lcap: scala.caps.Capability^{cap.rd}) ?->? Cap^{lcap} ->? Id[Cap^{cap².rd}]^?
4+
|Found: (lcap: scala.caps.Capability^{cap.rd}) ?->? Cap^? ->? Id[Cap^?]^?
55
|Required: (lcap: scala.caps.Capability^{cap.rd}) ?-> Cap^{lcap} => Id[Cap^?]^?
66
|
7-
|where: => refers to a root capability associated with the result type of (using lcap: scala.caps.Capability^{cap.rd}): Cap^{lcap} => Id[Cap^?]^?
8-
| cap is the universal root capability
9-
| cap² is a root capability associated with the result type of (x$0: Cap^{lcap}): Id[Cap^{cap².rd}]^?
7+
|where: => refers to a root capability associated with the result type of (using lcap: scala.caps.Capability^{cap.rd}): Cap^{lcap} => Id[Cap^?]^?
8+
| cap is the universal root capability
109
|
11-
|Note that reference <cap of (x$0: Cap^{lcap}): Id[Cap^{cap.rd}]^?>.rd
10+
|Note that reference <cap of (x$0: Cap^?): Id[Cap^?]^?>.rd
1211
|cannot be included in outer capture set ?
1312
|
1413
| longer explanation available when compiling with `-explain`

‎tests/neg-custom-args/captures/i15923a.check

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,14 @@
11
-- [E007] Type Mismatch Error: tests/neg-custom-args/captures/i15923a.scala:7:21 ---------------------------------------
22
7 | val leak = withCap(lcap => () => mkId(lcap)) // error
33
| ^^^^^^^^^^^^^^^^^^^^^^^^
4-
|Found: (lcap: Cap^) ->? () ->? Id[Cap^²]^?
4+
|Found: (lcap: Cap^?) ->? () ->? Id[Cap^?]^?
55
|Required: (lcap: Cap^) => () =>² Id[Cap^?]^?
66
|
77
|where: => refers to a fresh root capability created in value leak when checking argument to parameter op of method withCap
88
| =>² refers to a root capability associated with the result type of (lcap: Cap^): () =>² Id[Cap^?]^?
99
| ^ refers to the universal root capability
10-
| ^² refers to a root capability associated with the result type of (): Id[Cap^²]^?
1110
|
12-
|Note that reference <cap of (): Id[Cap^]^?>
11+
|Note that reference <cap of (): Id[Cap^?]^?>
1312
|cannot be included in outer capture set ?
1413
|
1514
| longer explanation available when compiling with `-explain`

‎tests/neg-custom-args/captures/i16226.check

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,25 @@
11
-- [E007] Type Mismatch Error: tests/neg-custom-args/captures/i16226.scala:13:4 ----------------------------------------
22
13 | (ref1, f1) => map[A, B](ref1, f1) // error
33
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
4-
|Found: (ref1: LazyRef[A^?]{val elem: () => A^?}^{io}, f1: A^? => B^?) ->? LazyRef[B^?]{val elem: () =>² B^?}^{f1, ref1}
5-
|Required: (LazyRef[A]^{io}, A => B) =>³ LazyRef[B]^
4+
|Found: (ref1: LazyRef[A^?]{val elem: () ->? A^?}^?, f1: A^? ->? B^?) ->? LazyRef[B^?]{val elem: () => B^?}^{f1, ref1}
5+
|Required: (LazyRef[A]^{io}, A =>² B) =>³ LazyRef[B]^
66
|
7-
|where: => refers to the universal root capability
8-
| =>² refers to a root capability associated with the result type of (ref1: LazyRef[A^?]{val elem: () => A^?}^{io}, f1: A^? => B^?): LazyRef[B^?]{val elem: () =>² B^?}^{f1, ref1}
7+
|where: => refers to a root capability associated with the result type of (ref1: LazyRef[A^?]{val elem: () ->? A^?}^?, f1: A^? ->? B^?): LazyRef[B^?]{val elem: () => B^?}^{f1, ref1}
8+
| =>² refers to the universal root capability
99
| =>³ refers to a fresh root capability in the result type of method mapc
1010
| ^ refers to a fresh root capability in the result type of method mapc
1111
|
1212
| longer explanation available when compiling with `-explain`
1313
-- [E007] Type Mismatch Error: tests/neg-custom-args/captures/i16226.scala:15:4 ----------------------------------------
1414
15 | (ref1, f1) => map[A, B](ref1, f1) // error
1515
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
16-
|Found: (ref1: LazyRef[A^?]{val elem: () => A^?}^{io}, f1: A^? => B^?) ->? LazyRef[B^?]{val elem: () =>² B^?}^{f1, ref1}
17-
|Required: (ref: LazyRef[A]^{io}, f: A => B) =>³ LazyRef[B]^
16+
|Found: (ref1: LazyRef[A^?]{val elem: () ->? A^?}^?, f1: A^? ->? B^?) ->? LazyRef[B^?]{val elem: () => B^?}^{f1, ref1}
17+
|Required: (ref: LazyRef[A]^{io}, f: A =>² B) =>³ LazyRef[B]^
1818
|
19-
|where: => refers to the universal root capability
20-
| =>² refers to a root capability associated with the result type of (ref1: LazyRef[A^?]{val elem: () => A^?}^{io}, f1: A^? => B^?): LazyRef[B^?]{val elem: () =>² B^?}^{f1, ref1}
19+
|where: => refers to a root capability associated with the result type of (ref1: LazyRef[A^?]{val elem: () ->? A^?}^?, f1: A^? ->? B^?): LazyRef[B^?]{val elem: () => B^?}^{f1, ref1}
20+
| =>² refers to the universal root capability
2121
| =>³ refers to a fresh root capability in the result type of method mapd
22-
| ^ refers to a root capability associated with the result type of (ref: LazyRef[A]^{io}, f: A => B): LazyRef[B]^
22+
| ^ refers to a root capability associated with the result type of (ref: LazyRef[A]^{io}, f: A =>² B): LazyRef[B]^
2323
|
2424
|Note that the existential capture root in LazyRef[B]^
2525
|cannot subsume the capability f1.type since that capability is not a SharedCapability

‎tests/neg-custom-args/captures/i21401.check

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
-- [E007] Type Mismatch Error: tests/neg-custom-args/captures/i21401.scala:15:23 ---------------------------------------
1616
15 | val a = usingIO[IO^](x => x) // error // error
1717
| ^^^^^^
18-
|Found: (x: IO^) ->? IO^{x}
18+
|Found: (x: IO^?) ->? IO^{x}
1919
|Required: IO^ => IO^²
2020
|
2121
|where: => refers to a fresh root capability created in value a when checking argument to parameter op of method usingIO

‎tests/neg-custom-args/captures/i21614.check

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@
1010
-- [E007] Type Mismatch Error: tests/neg-custom-args/captures/i21614.scala:15:12 ---------------------------------------
1111
15 | files.map(new Logger(_)) // error, Q: can we improve the error message?
1212
| ^^^^^^^^^^^^^
13-
|Found: (_$1: File^{files*}) ->{files*} Logger{val f: File^{_$1}}^{cap.rd, _$1}
13+
|Found: (_$1: File^?) ->{files*} Logger{val f: File^{_$1}}^{cap.rd, _$1}
1414
|Required: File^{files*} => Logger{val f: File^?}^?
1515
|
1616
|where: => refers to a fresh root capability created in method mkLoggers2 when checking argument to parameter f of method map
17-
| cap is a root capability associated with the result type of (_$1: File^{files*}): Logger{val f: File^{_$1}}^{cap.rd, _$1}
17+
| cap is a root capability associated with the result type of (_$1: File^?): Logger{val f: File^{_$1}}^{cap.rd, _$1}
1818
|
1919
|Note that reference <cap of (_$1: File^{files*}): Logger{val f: File^?}^?>.rd
2020
|cannot be included in outer capture set ?

‎tests/neg-custom-args/captures/leaking-iterators.check

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
-- [E007] Type Mismatch Error: tests/neg-custom-args/captures/leaking-iterators.scala:56:16 ----------------------------
22
56 | usingLogFile: log => // error
33
| ^
4-
|Found: (log: java.io.FileOutputStream^) ->? cctest.Iterator[Int]^{log}
4+
|Found: (log: java.io.FileOutputStream^?) ->? cctest.Iterator[Int]^{log}
55
|Required: java.io.FileOutputStream^ => cctest.Iterator[Int]^?
66
|
77
|where: => refers to a fresh root capability created in method test when checking argument to parameter op of method usingLogFile

0 commit comments

Comments
 (0)