Fix wrong parens in compareCapturing test

odersky · odersky · commit d1d47003221e · 2025-11-10T11:37:23.000+01:00
This fix removed quite a few spurious error notes.
diff --git a/compiler/src/dotty/tools/dotc/core/TypeComparer.scala b/compiler/src/dotty/tools/dotc/core/TypeComparer.scala
@@ -2913,8 +2913,8 @@ class TypeComparer(@constructorOnly initctx: Context) extends ConstraintHandling
           errorNotes = (level, CaptureSet.MutAdaptFailure(cs, tp1, tp2)) :: rest
         case _ =>
     subc
-    && (tp1.isBoxedCapturing == tp2.isBoxedCapturing)
-        || refs1.subCaptures(CaptureSet.empty, makeVarState())
+    && (tp1.isBoxedCapturing == tp2.isBoxedCapturing
+        || refs1.subCaptures(CaptureSet.empty, makeVarState()))
 
   protected def logUndoAction(action: () => Unit) =
     undoLog += action
diff --git a/tests/neg-custom-args/captures/lazyvals-sep.check b/tests/neg-custom-args/captures/lazyvals-sep.check
@@ -29,8 +29,6 @@
    |Found:    Ref^{TestClass.this.r.rd}
    |Required: Ref^
    |
-   |Note that capability TestClass.this.r.rd is not included in capture set {}.
-   |
    |Note that {cap} is an exclusive capture set of the mutable type Ref^,
    |it cannot subsume a read-only capture set of the mutable type Ref^{TestClass.this.r.rd}.
    |
@@ -43,8 +41,6 @@
    |Found:    Ref^{TestClass.this.r.rd}
    |Required: Ref^
    |
-   |Note that capability TestClass.this.r.rd is not included in capture set {}.
-   |
    |Note that {cap} is an exclusive capture set of the mutable type Ref^,
    |it cannot subsume a read-only capture set of the mutable type Ref^{TestClass.this.r.rd}.
    |
diff --git a/tests/neg-custom-args/captures/linear-buffer.check b/tests/neg-custom-args/captures/linear-buffer.check
@@ -4,8 +4,6 @@
   |                   Found:    BadBuffer[T]^{BadBuffer.this.rd}
   |                   Required: BadBuffer[T]^
   |
-  |                   Note that capability BadBuffer.this.rd is not included in capture set {}.
-  |
   |                   Note that {cap} is an exclusive capture set of the mutable type BadBuffer[T]^,
   |                   it cannot subsume a read-only capture set of the mutable type BadBuffer[T]^{BadBuffer.this.rd}.
   |
diff --git a/tests/neg-custom-args/captures/mutability.check b/tests/neg-custom-args/captures/mutability.check
@@ -14,8 +14,6 @@
    |                         Found:    Ref[T]^{Ref.this.rd}
    |                         Required: Ref[T]^
    |
-   |                         Note that capability Ref.this.rd is not included in capture set {}.
-   |
    |                         Note that {cap} is an exclusive capture set of the mutable type Ref[T]^,
    |                         it cannot subsume a read-only capture set of the mutable type Ref[T]^{Ref.this.rd}.
    |
@@ -40,8 +38,6 @@
    |                         Found:    () ->{Ref.this.rd} Ref[T^'s1]^{Ref.this.rd}
    |                         Required: () => Ref[T]^
    |
-   |                         Note that capability Ref.this.rd is not included in capture set {}.
-   |
    |                         Note that {cap} is an exclusive capture set of the mutable type Ref[T]^,
    |                         it cannot subsume a read-only capture set of the mutable type Ref[T^'s1]^{Ref.this.rd}.
    |
@@ -67,8 +63,6 @@
    |                         Found:    Ref[T]^{Ref.this.rd}
    |                         Required: Ref[T]^
    |
-   |                         Note that capability Ref.this.rd is not included in capture set {}.
-   |
    |                         Note that {cap} is an exclusive capture set of the mutable type Ref[T]^,
    |                         it cannot subsume a read-only capture set of the mutable type Ref[T]^{Ref.this.rd}.
    |
@@ -103,8 +97,6 @@
    |                             Found:    () ->{ref2.rd} Ref2[Int]^{ref2}
    |                             Required: () => Ref2[Int]^
    |
-   |                             Note that capability ref2 is not included in capture set {}.
-   |
    |                             Note that {cap} is an exclusive capture set of the mutable type Ref2[Int]^,
    |                             it cannot subsume a read-only capture set of the mutable type Ref2[Int]^{ref2}.
    |
diff --git a/tests/neg-custom-args/captures/mutvars.check b/tests/neg-custom-args/captures/mutvars.check
@@ -14,8 +14,6 @@
   |                         Found:    Ref[T]^{Ref.this.rd}
   |                         Required: Ref[T]^
   |
-  |                         Note that capability Ref.this.rd is not included in capture set {}.
-  |
   |                         Note that {cap} is an exclusive capture set of the mutable type Ref[T]^,
   |                         it cannot subsume a read-only capture set of the mutable type Ref[T]^{Ref.this.rd}.
   |
@@ -33,8 +31,6 @@
    |                         Found:    () ->{Ref.this.rd} Ref[T^'s1]^{Ref.this.rd}
    |                         Required: () => Ref[T]^
    |
-   |                         Note that capability Ref.this.rd is not included in capture set {}.
-   |
    |                         Note that {cap} is an exclusive capture set of the mutable type Ref[T]^,
    |                         it cannot subsume a read-only capture set of the mutable type Ref[T^'s1]^{Ref.this.rd}.
    |
@@ -53,8 +49,6 @@
    |                         Found:    Ref[T]^{Ref.this.rd}
    |                         Required: Ref[T]^
    |
-   |                         Note that capability Ref.this.rd is not included in capture set {}.
-   |
    |                         Note that {cap} is an exclusive capture set of the mutable type Ref[T]^,
    |                         it cannot subsume a read-only capture set of the mutable type Ref[T]^{Ref.this.rd}.
    |
@@ -82,8 +76,6 @@
    |                             Found:    () ->{ref2.rd} Ref2[Int]^{ref2}
    |                             Required: () => Ref2[Int]^
    |
-   |                             Note that capability ref2 is not included in capture set {}.
-   |
    |                             Note that {cap} is an exclusive capture set of the mutable type Ref2[Int]^,
    |                             it cannot subsume a read-only capture set of the mutable type Ref2[Int]^{ref2}.
    |
diff --git a/tests/neg-custom-args/captures/ro-mut-conformance.check b/tests/neg-custom-args/captures/ro-mut-conformance.check
@@ -9,8 +9,6 @@
    |                     Found:    (a : Ref)
    |                     Required: Ref^
    |
-   |                     Note that capability a is not included in capture set {}.
-   |
    |                     Note that {cap} is an exclusive capture set of the mutable type Ref^,
    |                     it cannot subsume a read-only capture set of the mutable type (a : Ref).
    |

Original file line number	Diff line number	Diff line change
`@@ -29,8 +29,6 @@`
`29`	`29`	`\|Found: Ref^{TestClass.this.r.rd}`
`30`	`30`	`\|Required: Ref^`
`31`	`31`	`\|`
`32`		`- \|Note that capability TestClass.this.r.rd is not included in capture set {}.`
`33`		`- \|`
`34`	`32`	`\|Note that {cap} is an exclusive capture set of the mutable type Ref^,`
`35`	`33`	`\|it cannot subsume a read-only capture set of the mutable type Ref^{TestClass.this.r.rd}.`
`36`	`34`	`\|`
`@@ -43,8 +41,6 @@`
`43`	`41`	`\|Found: Ref^{TestClass.this.r.rd}`
`44`	`42`	`\|Required: Ref^`
`45`	`43`	`\|`
`46`		`- \|Note that capability TestClass.this.r.rd is not included in capture set {}.`
`47`		`- \|`
`48`	`44`	`\|Note that {cap} is an exclusive capture set of the mutable type Ref^,`
`49`	`45`	`\|it cannot subsume a read-only capture set of the mutable type Ref^{TestClass.this.r.rd}.`
`50`	`46`	`\|`
Original file line number	Diff line number	Diff line change
`@@ -4,8 +4,6 @@`
`4`	`4`	`\| Found: BadBuffer[T]^{BadBuffer.this.rd}`
`5`	`5`	`\| Required: BadBuffer[T]^`
`6`	`6`	`\|`
`7`		`- \| Note that capability BadBuffer.this.rd is not included in capture set {}.`
`8`		`- \|`
`9`	`7`	`\| Note that {cap} is an exclusive capture set of the mutable type BadBuffer[T]^,`
`10`	`8`	`\| it cannot subsume a read-only capture set of the mutable type BadBuffer[T]^{BadBuffer.this.rd}.`
`11`	`9`	`\|`
Original file line number	Diff line number	Diff line change
`@@ -14,8 +14,6 @@`
`14`	`14`	`\| Found: Ref[T]^{Ref.this.rd}`
`15`	`15`	`\| Required: Ref[T]^`
`16`	`16`	`\|`
`17`		`- \| Note that capability Ref.this.rd is not included in capture set {}.`
`18`		`- \|`
`19`	`17`	`\| Note that {cap} is an exclusive capture set of the mutable type Ref[T]^,`
`20`	`18`	`\| it cannot subsume a read-only capture set of the mutable type Ref[T]^{Ref.this.rd}.`
`21`	`19`	`\|`
`@@ -40,8 +38,6 @@`
`40`	`38`	`\| Found: () ->{Ref.this.rd} Ref[T^'s1]^{Ref.this.rd}`
`41`	`39`	`\| Required: () => Ref[T]^`
`42`	`40`	`\|`
`43`		`- \| Note that capability Ref.this.rd is not included in capture set {}.`
`44`		`- \|`
`45`	`41`	`\| Note that {cap} is an exclusive capture set of the mutable type Ref[T]^,`
`46`	`42`	`\| it cannot subsume a read-only capture set of the mutable type Ref[T^'s1]^{Ref.this.rd}.`
`47`	`43`	`\|`
`@@ -67,8 +63,6 @@`
`67`	`63`	`\| Found: Ref[T]^{Ref.this.rd}`
`68`	`64`	`\| Required: Ref[T]^`
`69`	`65`	`\|`
`70`		`- \| Note that capability Ref.this.rd is not included in capture set {}.`
`71`		`- \|`
`72`	`66`	`\| Note that {cap} is an exclusive capture set of the mutable type Ref[T]^,`
`73`	`67`	`\| it cannot subsume a read-only capture set of the mutable type Ref[T]^{Ref.this.rd}.`
`74`	`68`	`\|`
`@@ -103,8 +97,6 @@`
`103`	`97`	`\| Found: () ->{ref2.rd} Ref2[Int]^{ref2}`
`104`	`98`	`\| Required: () => Ref2[Int]^`
`105`	`99`	`\|`
`106`		`- \| Note that capability ref2 is not included in capture set {}.`
`107`		`- \|`
`108`	`100`	`\| Note that {cap} is an exclusive capture set of the mutable type Ref2[Int]^,`
`109`	`101`	`\| it cannot subsume a read-only capture set of the mutable type Ref2[Int]^{ref2}.`
`110`	`102`	`\|`
Original file line number	Diff line number	Diff line change
`@@ -9,8 +9,6 @@`
`9`	`9`	`\| Found: (a : Ref)`
`10`	`10`	`\| Required: Ref^`
`11`	`11`	`\|`
`12`		`- \| Note that capability a is not included in capture set {}.`
`13`		`- \|`
`14`	`12`	`\| Note that {cap} is an exclusive capture set of the mutable type Ref^,`
`15`	`13`	`\| it cannot subsume a read-only capture set of the mutable type (a : Ref).`
`16`	`14`	`\|`