Alt tweak

Author: som-snytt

compiler/src/dotty/tools/dotc/reporting/Message.scala

@@ -132,9 +132,9 @@ object Message:
         def sameSuperscript(cur: Recorded, existing: Recorded) =
           (cur eq existing) ||
           (cur, existing).match
-            case (cur: ParamRef, existing: ParamRef) =>
-              (cur.paramName eq existing.paramName)
-              && cur.binder.paramNames == existing.binder.paramNames
+            case (cur: ParamRef, existing: ParamRef) => true
+              //(cur.paramName eq existing.paramName)
+              //&& cur.binder.paramNames == existing.binder.paramNames
             case _ =>
               false
 

tests/neg-custom-args/captures/filevar.check

@@ -5,12 +5,10 @@
    |The leakage occurred when trying to match the following types:
    |
    |Found:    (l: scala.caps.Capability^) ?->'s2 File^'s3 ->'s4 Unit
-   |Required: (l²: scala.caps.Capability^) ?-> (f: File^{l²}) => Unit
+   |Required: (l: scala.caps.Capability^) ?-> (f: File^{l}) => Unit
    |
-   |where:    => refers to a root capability associated with the result type of (using l²: scala.caps.Capability^): (f: File^{l²}) => Unit
+   |where:    => refers to a root capability associated with the result type of (using l: scala.caps.Capability^): (f: File^{l}) => Unit
    |          ^  refers to the universal root capability
-   |          l  is a reference to a value parameter
-   |          l² is a reference to a value parameter
 16 |    val o = Service()
 17 |    o.file = f
 18 |    o.log

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

@@ -5,12 +5,10 @@
    |The leakage occurred when trying to match the following types:
    |
    |Found:    (lcap: scala.caps.Capability^) ?->'s2 Cap^'s3 ->'s4 Id[Cap^'s5]^'s6
-   |Required: (lcap²: scala.caps.Capability^) ?-> Cap^{lcap²} => Id[Cap^'s1]^'s7
+   |Required: (lcap: scala.caps.Capability^) ?-> Cap^{lcap} => Id[Cap^'s1]^'s7
    |
-   |where:    =>    refers to a root capability associated with the result type of (using lcap²: scala.caps.Capability^): Cap^{lcap²} => Id[Cap^'s1]^'s7
-   |          ^     refers to the universal root capability
-   |          cap   is a root capability associated with the result type of (x$0: Cap^'s3): Id[Cap^'s5]^'s6
-   |          lcap  is a reference to a value parameter
-   |          lcap² is a reference to a value parameter
+   |where:    =>  refers to a root capability associated with the result type of (using lcap: scala.caps.Capability^): Cap^{lcap} => Id[Cap^'s1]^'s7
+   |          ^   refers to the universal root capability
+   |          cap is a root capability associated with the result type of (x$0: Cap^'s3): Id[Cap^'s5]^'s6
    |
    | longer explanation available when compiling with `-explain`