Skip to content

Commit 523bc78

Browse files
oderskyodersky
committed
Print "box" only under -Ycc-verbose
1 parent b2f30a8 commit 523bc78

Some content is hidden

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

45 files changed

+183
-185
lines changed

‎compiler/src/dotty/tools/dotc/printing/PlainPrinter.scala‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -282,7 +282,7 @@ class PlainPrinter(_ctx: Context) extends Printer {
282282
(" <: " ~ toText(bound) provided !bound.isAny)
283283
}.close
284284
case tp @ CapturingType(parent, refs) =>
285-
val boxText: Text = Str("box ") provided tp.isBoxed //&& ctx.settings.YccDebug.value
285+
val boxText: Text = Str("box ") provided tp.isBoxed && ccVerbose
286286
if elideCapabilityCaps
287287
&& parent.derivesFrom(defn.Caps_Capability)
288288
&& refs.containsTerminalCapability

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,31 @@
11
-- [E057] Type Mismatch Error: tests/neg-custom-args/captures/boundschecks3.scala:9:11 ---------------------------------
22
9 | val foo: C[Tree^] = ??? // error
33
| ^
4-
| Type argument box test.Tree^ does not conform to upper bound test.Tree in inferred type test.C[box test.Tree^]
4+
| Type argument test.Tree^ does not conform to upper bound test.Tree in inferred type test.C[test.Tree^]
55
|
6-
| where: ^ refers to the universal root capability
6+
| where: ^ refers to the universal root capability
77
|
88
| longer explanation available when compiling with `-explain`
99
-- [E057] Type Mismatch Error: tests/neg-custom-args/captures/boundschecks3.scala:10:11 --------------------------------
1010
10 | type T = C[Tree^] // error
1111
| ^
12-
| Type argument box test.Tree^ does not conform to upper bound test.Tree in inferred type test.C[box test.Tree^]
12+
| Type argument test.Tree^ does not conform to upper bound test.Tree in inferred type test.C[test.Tree^]
1313
|
14-
| where: ^ refers to the universal root capability
14+
| where: ^ refers to the universal root capability
1515
|
1616
| longer explanation available when compiling with `-explain`
1717
-- [E057] Type Mismatch Error: tests/neg-custom-args/captures/boundschecks3.scala:11:11 --------------------------------
1818
11 | val bar: T -> T = ??? // error
1919
| ^
20-
|Type argument box test.Tree^ does not conform to upper bound test.Tree in subpart test.C[box test.Tree^] of inferred type test.C[box test.Tree^] -> test.C[box test.Tree^]
20+
|Type argument test.Tree^ does not conform to upper bound test.Tree in subpart test.C[test.Tree^] of inferred type test.C[test.Tree^] -> test.C[test.Tree^]
2121
|
2222
|where: ^ refers to the universal root capability
2323
|
2424
| longer explanation available when compiling with `-explain`
2525
-- [E057] Type Mismatch Error: tests/neg-custom-args/captures/boundschecks3.scala:12:11 --------------------------------
2626
12 | val baz: C[Tree^] -> Unit = ??? // error
2727
| ^
28-
|Type argument box test.Tree^ does not conform to upper bound test.Tree in subpart test.C[box test.Tree^] of inferred type test.C[box test.Tree^] -> Unit
28+
|Type argument test.Tree^ does not conform to upper bound test.Tree in subpart test.C[test.Tree^] of inferred type test.C[test.Tree^] -> Unit
2929
|
3030
|where: ^ refers to the universal root capability
3131
|

‎tests/neg-custom-args/captures/box-adapt-cases.check‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
-- [E007] Type Mismatch Error: tests/neg-custom-args/captures/box-adapt-cases.scala:8:10 -------------------------------
22
8 | x.value(cap => cap.use()) // error, was OK
33
| ^^^^^^^^^^^^^^^^
4-
| Found: (cap: box Cap^?) => Int
5-
| Required: box Cap^ =>² Int
4+
| Found: (cap: Cap^?) => Int
5+
| Required: Cap^ =>² Int
66
|
77
| where: => refers to the universal root capability
88
| =>² refers to a fresh root capability created in method test1
@@ -12,14 +12,14 @@
1212
-- [E007] Type Mismatch Error: tests/neg-custom-args/captures/box-adapt-cases.scala:15:10 ------------------------------
1313
15 | x.value(cap => cap.use()) // error
1414
| ^^^^^^^^^^^^^^^^
15-
| Found: (cap: box Cap^{io}) ->{io} Int
16-
| Required: box Cap^{io} -> Int
15+
| Found: (cap: Cap^{io}) ->{io} Int
16+
| Required: Cap^{io} -> Int
1717
|
1818
| longer explanation available when compiling with `-explain`
1919
-- [E007] Type Mismatch Error: tests/neg-custom-args/captures/box-adapt-cases.scala:29:10 ------------------------------
2020
29 | x.value(cap => cap.use()) // error
2121
| ^^^^^^^^^^^^^^^^
22-
| Found: (cap: box Cap^?) ->{io, fs} Int
23-
| Required: box Cap^{io, fs} ->{io} Int
22+
| Found: (cap: Cap^?) ->{io, fs} Int
23+
| Required: Cap^{io, fs} ->{io} Int
2424
|
2525
| longer explanation available when compiling with `-explain`

‎tests/neg-custom-args/captures/box-adapt-contra.check‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
-- Error: tests/neg-custom-args/captures/box-adapt-contra.scala:9:52 ---------------------------------------------------
22
9 | val f: (Cap^{c} -> Unit) -> Unit = useCap[Cap^{c}](c) // error
33
| ^^^^^^^^^^^^^^^^^^
4-
| Cap^{c} -> Unit cannot be box-converted to box Cap^{c} ->{c} Unit
5-
| since the additional capture set {c} resulting from box conversion is not allowed in box Cap^{c} -> Unit
4+
| Cap^{c} -> Unit cannot be box-converted to Cap^{c} ->{c} Unit
5+
| since the additional capture set {c} resulting from box conversion is not allowed in Cap^{c} -> Unit
66
-- Error: tests/neg-custom-args/captures/box-adapt-contra.scala:13:57 --------------------------------------------------
77
13 | val f1: (Cap^{c} => Unit) ->{c} Unit = useCap1[Cap^{c}](c) // error, was ok when cap was a root
88
| ^^^^^^^^^^^^^^^^^^^
9-
| Cap^{c} => Unit cannot be box-converted to box Cap^{c} ->{cap, c} Unit
10-
| since the additional capture set {c} resulting from box conversion is not allowed in box Cap^{c} => Unit
9+
| Cap^{c} => Unit cannot be box-converted to Cap^{c} ->{cap, c} Unit
10+
| since the additional capture set {c} resulting from box conversion is not allowed in Cap^{c} => Unit
1111
|
12-
| where: => refers to the universal root capability
13-
| cap is the universal root capability
12+
| where: => refers to the universal root capability
13+
| cap is the universal root capability
1414
-- Error: tests/neg-custom-args/captures/box-adapt-contra.scala:19:54 --------------------------------------------------
1515
19 | val f3: (Cap^{c} -> Unit) => Unit = useCap3[Cap^{c}](c) // error
1616
| ^^^^^^^^^^^^^^^^^^^
17-
| Cap^{c} -> Unit cannot be box-converted to box Cap^{c} ->{d, c} Unit
18-
| since the additional capture set {c} resulting from box conversion is not allowed in box Cap^{c} ->{d} Unit
17+
| Cap^{c} -> Unit cannot be box-converted to Cap^{c} ->{d, c} Unit
18+
| since the additional capture set {c} resulting from box conversion is not allowed in Cap^{c} ->{d} Unit

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -40,23 +40,23 @@
4040
-- Error: tests/neg-custom-args/captures/capt1.scala:36:16 -------------------------------------------------------------
4141
36 | val z2 = h[() -> Cap](() => x) // error // error
4242
| ^^^^^^^^^
43-
| Type variable X of method h cannot be instantiated to () -> box C^ since
44-
| the part box C^ of that type captures the root capability `cap`.
43+
| Type variable X of method h cannot be instantiated to () -> C^ since
44+
| the part C^ of that type captures the root capability `cap`.
4545
|
4646
| where: ^ refers to the universal root capability
4747
-- [E007] Type Mismatch Error: tests/neg-custom-args/captures/capt1.scala:36:24 ----------------------------------------
4848
36 | val z2 = h[() -> Cap](() => x) // error // error
4949
| ^^^^^^^
50-
|Found: () ->{x} box C^{x}
51-
|Required: () -> box C^
50+
|Found: () ->{x} C^{x}
51+
|Required: () -> C^
5252
|
5353
|where: ^ refers to a fresh root capability created in value z2 when checking argument to parameter a of method h
5454
|
5555
| longer explanation available when compiling with `-explain`
5656
-- Error: tests/neg-custom-args/captures/capt1.scala:38:13 -------------------------------------------------------------
5757
38 | val z3 = h[(() -> Cap) @retains[x.type]](() => x)(() => C()) // error
5858
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
59-
| Type variable X of method h cannot be instantiated to box () ->{x} C^ since
59+
| Type variable X of method h cannot be instantiated to () ->{x} C^ since
6060
| the part C^ of that type captures the root capability `cap`.
6161
|
6262
| where: ^ refers to the universal root capability

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,4 @@
1111
-- Error: tests/neg-custom-args/captures/delayedRunops.scala:22:16 -----------------------------------------------------
1212
22 | val ops1: List[() => Unit] = ops // error
1313
| ^^^^^^^^^^^^^^^^
14-
| Separation failure: value ops1's type List[box () => Unit] hides non-local parameter ops
14+
| Separation failure: value ops1's type List[() => Unit] hides non-local parameter ops

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

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
-- [E007] Type Mismatch Error: tests/neg-custom-args/captures/depfun-reach.scala:12:27 ---------------------------------
22
12 | List(() => op.foreach((f,g) => { f(); g() })) // error (???)
33
| ^^^^^^^^^^^^^^^^^^^^
4-
|Found: (x$1: (box () ->? Unit, box () ->? Unit)^?) ->? Unit
5-
|Required: ((box () ->{op*} Unit, box () ->{op*} Unit)) => Unit
4+
|Found: (x$1: (() ->? Unit, () ->? Unit)^?) ->? Unit
5+
|Required: ((() ->{op*} Unit, () ->{op*} Unit)) => Unit
66
|
77
|where: => refers to a fresh root capability created in anonymous function of type (): Unit when checking argument to parameter op of method foreach
88
|
99
| longer explanation available when compiling with `-explain`
1010
-- [E007] Type Mismatch Error: tests/neg-custom-args/captures/depfun-reach.scala:19:4 ----------------------------------
1111
19 | op // error
1212
| ^^
13-
| Found: (op : (xs: List[(X, box () ->{io} Unit)]) => List[box () ->{xs*} Unit])
14-
| Required: (xs: List[(X, box () ->{io} Unit)]) =>² List[() -> Unit]
13+
| Found: (op : (xs: List[(X, () ->{io} Unit)]) => List[() ->{xs*} Unit])
14+
| Required: (xs: List[(X, () ->{io} Unit)]) =>² List[() -> Unit]
1515
|
1616
| where: => refers to a fresh root capability in the type of parameter op
1717
| =>² refers to a fresh root capability in the result type of method foo
@@ -20,15 +20,15 @@
2020
-- [E007] Type Mismatch Error: tests/neg-custom-args/captures/depfun-reach.scala:26:60 ---------------------------------
2121
26 | val b: (xs: List[() ->{io} Unit]) => List[() ->{} Unit] = a // error
2222
| ^
23-
| Found: (a : (xs: List[box () ->{io} Unit]) => List[box () ->{xs*} Unit])
24-
| Required: (xs: List[box () ->{io} Unit]) =>² List[() -> Unit]
23+
| Found: (a : (xs: List[() ->{io} Unit]) => List[() ->{xs*} Unit])
24+
| Required: (xs: List[() ->{io} Unit]) =>² List[() -> Unit]
2525
|
26-
| where: => refers to a fresh root capability in the type of value a
27-
| =>² refers to a fresh root capability in the type of value b
26+
| where: => refers to a fresh root capability in the type of value a
27+
| =>² refers to a fresh root capability in the type of value b
2828
|
2929
| longer explanation available when compiling with `-explain`
3030
-- Error: tests/neg-custom-args/captures/depfun-reach.scala:18:17 ------------------------------------------------------
3131
18 | : (xs: List[(X, () ->{io} Unit)]) => List[() ->{} Unit] = // error
3232
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
33-
|Separation failure: method foo's result type (xs: List[(X, box () ->{io} Unit)]) => List[() -> Unit] hides parameter op.
33+
|Separation failure: method foo's result type (xs: List[(X, () ->{io} Unit)]) => List[() -> Unit] hides parameter op.
3434
|The parameter needs to be annotated with @consume to allow this.

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

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
63 | Result:
33
64 | Future: // error, type mismatch
44
| ^
5-
| Found: Result.Ok[box Future[box T^?]^{fr, contextual$1}]
5+
| Found: Result.Ok[Future[T^?]^{fr, contextual$1}]
66
| Required: Result[Future[T], Nothing]
77
65 | fr.await.ok
88
|--------------------------------------------------------------------------------------------------------------------
@@ -17,9 +17,8 @@
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[box Result[box Future[box T^?]^?, box E^?]^?]^) ?->{fr, async}
21-
| box Future[box T^?]^{fr, contextual$9}
22-
|Required: (boundary.Label[Result[box Future[box T^?]^{fr, async}, box E^?]]^) ?=> box Future[box 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^?]^{fr, async}, E^?]]^) ?=> Future[T^?]^{fr, async}
2322
|
2423
|where: ?=> refers to a fresh root capability created in method fail4 when checking argument to parameter body of method make
2524
| ^ refers to the universal root capability
@@ -32,7 +31,7 @@
3231
-- [E007] Type Mismatch Error: tests/neg-custom-args/captures/effect-swaps-explicit.scala:73:35 ------------------------
3332
73 | Result.make[Future[T], E]: lbl ?=> // error: type mismatch
3433
| ^
35-
|Found: (lbl: boundary.Label[box Result[box Future[box T^?]^?, box E^?]^?]^) ?->{fr, async} Future[box T^?]^{fr, lbl}
34+
|Found: (lbl: boundary.Label[Result[Future[T^?]^?, E^?]^?]^) ?->{fr, async} Future[T^?]^{fr, lbl}
3635
|Required: (boundary.Label[Result[Future[T], E]]^) ?=> Future[T]
3736
|
3837
|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 & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
63 | Result:
33
64 | Future: // error, type mismatch
44
| ^
5-
| Found: Result.Ok[box Future[box T^?]^{fr, contextual$1}]
5+
| Found: Result.Ok[Future[T^?]^{fr, contextual$1}]
66
| Required: Result[Future[T], Nothing]
77
65 | fr.await.ok
88
|--------------------------------------------------------------------------------------------------------------------
@@ -17,9 +17,8 @@
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[box Result[box Future[box T^?]^?, box E^?]^?]^{cap.rd}) ?->{fr, async}
21-
| box Future[box T^?]^{fr, contextual$9}
22-
|Required: (boundary.Label[Result[box Future[box T^?]^{fr, async}, box E^?]]^{cap.rd}) ?=> box Future[box T^?]^{fr, async}
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}
2322
|
2423
|where: ?=> refers to a fresh root capability created in method fail4 when checking argument to parameter body of method make
2524
| cap is the universal root capability
@@ -32,7 +31,7 @@
3231
-- [E007] Type Mismatch Error: tests/neg-custom-args/captures/effect-swaps.scala:73:35 ---------------------------------
3332
73 | Result.make[Future[T], E]: lbl ?=> // error: type mismatch
3433
| ^
35-
|Found: (lbl: boundary.Label[box Result[box Future[box T^?]^?, box E^?]^?]^{cap.rd}) ?->{fr, async} Future[box T^?]^{fr, lbl}
34+
|Found: (lbl: boundary.Label[Result[Future[T^?]^?, E^?]^?]^{cap.rd}) ?->{fr, async} Future[T^?]^{fr, lbl}
3635
|Required: (boundary.Label[Result[Future[T], E]]^{cap.rd}) ?=> Future[T]
3736
|
3837
|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/eta.check‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
-- [E007] Type Mismatch Error: tests/neg-custom-args/captures/eta.scala:6:14 -------------------------------------------
99
6 | bar( () => f ) // error
1010
| ^^^^^^^
11-
| Found: () ->{f} box () ->{f} Unit
12-
| Required: () -> box () ->? Unit
11+
| Found: () ->{f} () ->{f} Unit
12+
| Required: () -> () ->? Unit
1313
|
1414
| longer explanation available when compiling with `-explain`

0 commit comments

Comments
 (0)