Drop local roots in tests

Author: odersky

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

@@ -5,7 +5,7 @@ class File:
   def write(x: String): Unit = ???
 
 class Service:
-  var file: File^{cap[Service]} = uninitialized  // error
+  var file: File^ = uninitialized  // error
   def log = file.write("log")
 
 def withFile[T](op: (l: caps.Cap) ?-> (f: File^{l}) => T): T =
@@ -14,5 +14,5 @@ def withFile[T](op: (l: caps.Cap) ?-> (f: File^{l}) => T): T =
 def test =
   withFile: f =>
     val o = Service()
-    o.file = f  // error
+    o.file = f
     o.log

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

@@ -2,14 +2,17 @@
 11 |    x = q           // error
    |        ^
    |        Found:    () ->{q} Unit
-   |        Required: () ->{cap[test]} Unit
+   |        Required: () ->{p, q²} Unit
+   |
+   |        where:    q  is a parameter in method inner
+   |                  q² is a parameter in method test
    |
    | longer explanation available when compiling with `-explain`
 -- [E007] Type Mismatch Error: tests/neg-custom-args/captures/outer-var.scala:12:9 -------------------------------------
 12 |    x = (q: Proc)   // error
    |         ^^^^^^^
-   |         Found:    () ->{cap[inner]} Unit
-   |         Required: () ->{cap[test]} Unit
+   |         Found:    Proc
+   |         Required: () ->{p, q} Unit
    |
    | longer explanation available when compiling with `-explain`
 -- [E007] Type Mismatch Error: tests/neg-custom-args/captures/outer-var.scala:13:9 -------------------------------------

tests/neg-custom-args/captures/localcaps.scala

@@ -4,7 +4,7 @@ type Cap = CC^
 type Proc = () => Unit
 
 def test(p: Proc, q: () => Unit) =
-  var x: () ->{cap[test]} Unit = p
+  var x: () ->{p, q} Unit = p
   var y = p // OK, y has type () ->{p} Proc
 
   def inner(q: Proc) =

tests/neg-custom-args/captures/nesting-inversion.scala

@@ -5,18 +5,15 @@ trait Cap:
 def usingCap[sealed T](op: Cap^ => T): T = ???
 
 def badTest(): Unit =
-  def bad(b: Boolean)(c: Cap^): Cap^{cap[bad]} =  // error
+  def bad(b: Boolean)(c: Cap^): Cap^{c} =
     if b then c
     else
-      val leaked = usingCap[Cap^{cap[bad]}](bad(true))
+      val leaked = usingCap(bad(true)) // error
       leaked.use  // boom
       c
 
   usingCap[Unit]: c0 =>
     bad(false)(c0)
 
-class Bad:
-  def foo: Cap^{cap[Bad]} = ??? // error
-  private def bar: Cap^{cap[Bad]} = ??? // ok
 
 

tests/neg-custom-args/captures/outer-var.check

@@ -1,15 +1,3 @@
--- Error: tests/neg-custom-args/captures/usingLogFile.scala:32:37 ------------------------------------------------------
-32 |  usingLogFile { f => later3 = () => f.write(0) }  // error
-   |                                     ^
-   |(f : java.io.FileOutputStream^) cannot be referenced here; it is not included in the allowed capture set {cap[<root>]}
-   |of an enclosing function literal with expected type () ->{cap[<root>]} Unit
--- [E007] Type Mismatch Error: tests/neg-custom-args/captures/usingLogFile.scala:36:35 ---------------------------------
-36 |  usingLogFile { f => later4 = Cell(() => f.write(0)) }  // error
-   |                               ^^^^^^^^^^^^^^^^^^^^^^
-   |                               Found:    Test2.Cell[box () ->{f} Unit]^?
-   |                               Required: Test2.Cell[box () ->{cap[<root>]} Unit]
-   |
-   | longer explanation available when compiling with `-explain`
 -- Error: tests/neg-custom-args/captures/usingLogFile.scala:23:14 ------------------------------------------------------
 23 |  val later = usingLogFile { f => () => f.write(0) } // error
    |              ^^^^^^^^^^^^
@@ -18,11 +6,11 @@
 28 |  private val later2 = usingLogFile { f => Cell(() => f.write(0)) } // error
    |                       ^^^^^^^^^^^^
    |                       local reference f leaks into outer capture set of type parameter T of method usingLogFile
--- Error: tests/neg-custom-args/captures/usingLogFile.scala:52:16 ------------------------------------------------------
-52 |    val later = usingFile("out", f => (y: Int) => xs.foreach(x => f.write(x + y))) // error
+-- Error: tests/neg-custom-args/captures/usingLogFile.scala:44:16 ------------------------------------------------------
+44 |    val later = usingFile("out", f => (y: Int) => xs.foreach(x => f.write(x + y))) // error
    |                ^^^^^^^^^
    |                local reference f leaks into outer capture set of type parameter T of method usingFile
--- Error: tests/neg-custom-args/captures/usingLogFile.scala:60:16 ------------------------------------------------------
-60 |    val later = usingFile("logfile", // error !!! but should be ok, since we can widen `l` to `file` instead of to `cap`
+-- Error: tests/neg-custom-args/captures/usingLogFile.scala:52:16 ------------------------------------------------------
+52 |    val later = usingFile("logfile", // error !!! but should be ok, since we can widen `l` to `file` instead of to `cap`
    |                ^^^^^^^^^
    |                local reference l leaks into outer capture set of type parameter T of method usingFile