Turn separation checking on by default

odersky · odersky · commit 94fcabc40a57 · 2025-01-29T23:27:36.000+01:00
Downgrade to -source 3.6 to turn it off.
diff --git a/project/Build.scala b/project/Build.scala
@@ -1225,7 +1225,7 @@ object Build {
     settings(scala2LibraryBootstrappedSettings).
     settings(
       moduleName := "scala2-library-cc",
-      scalacOptions ++= Seq("-Ycheck:all", "-source", "3.7")
+      scalacOptions += "-Ycheck:all"
     )
 
   lazy val scala2LibraryBootstrappedSettings = Seq(
diff --git a/tests/neg-custom-args/captures/box-adapt-cases.scala b/tests/neg-custom-args/captures/box-adapt-cases.scala
@@ -1,4 +1,4 @@
-import language.`3.7` // sepchecks on
+
 trait Cap { def use(): Int }
 
 def test1(): Unit = {
diff --git a/tests/neg-custom-args/captures/box-adapt-contra.scala b/tests/neg-custom-args/captures/box-adapt-contra.scala
@@ -1,4 +1,4 @@
-import language.future // sepchecks on
+
 import caps.consume
 
 trait Cap
diff --git a/tests/neg-custom-args/captures/capt-depfun.scala b/tests/neg-custom-args/captures/capt-depfun.scala
@@ -1,5 +1,5 @@
 import annotation.retains
-import language.future // sepchecks on
+
 
 class C
 type Cap = C @retains(caps.cap)
diff --git a/tests/neg-custom-args/captures/capt1.scala b/tests/neg-custom-args/captures/capt1.scala
@@ -1,4 +1,4 @@
-import language.future // sepchecks on
+
 import annotation.retains
 class C
 def f(x: C @retains(caps.cap), y: C): () -> C =
diff --git a/tests/neg-custom-args/captures/cc-ex-conformance.scala b/tests/neg-custom-args/captures/cc-ex-conformance.scala
@@ -1,6 +1,6 @@
 import language.experimental.captureChecking
 import caps.{Exists, Capability}
-import language.future // sepchecks on
+
 
 class C
 
diff --git a/tests/neg-custom-args/captures/delayedRunops.scala b/tests/neg-custom-args/captures/delayedRunops.scala
@@ -1,5 +1,5 @@
 import language.experimental.captureChecking
-import language.future // sepchecks on
+
 import caps.{use, consume}
 
   // ok
diff --git a/tests/neg-custom-args/captures/depfun-reach.scala b/tests/neg-custom-args/captures/depfun-reach.scala
@@ -1,6 +1,6 @@
 import language.experimental.captureChecking
 import caps.cap
-import language.`3.7` // sepchecks on
+
 def test(io: Object^, async: Object^) =
   def compose(op: List[(() ->{cap} Unit, () ->{cap} Unit)]): List[() ->{op*} Unit] =
     List(() => op.foreach((f,g) => { f(); g() }))
diff --git a/tests/neg-custom-args/captures/effect-swaps-explicit.scala b/tests/neg-custom-args/captures/effect-swaps-explicit.scala
@@ -1,4 +1,4 @@
-import language.future // sepchecks on
+
 
 object boundary:
 
diff --git a/tests/neg-custom-args/captures/effect-swaps.scala b/tests/neg-custom-args/captures/effect-swaps.scala
@@ -1,4 +1,4 @@
-import language.future // sepchecks on
+
 
 object boundary:
 
diff --git a/tests/neg-custom-args/captures/existential-mapping.scala b/tests/neg-custom-args/captures/existential-mapping.scala
@@ -1,5 +1,5 @@
 import language.experimental.captureChecking
-import language.`3.7` // sepchecks on
+
 class A
 class C
 type Fun[X] = (x: C^) -> X
diff --git a/tests/neg-custom-args/captures/filevar-expanded.scala b/tests/neg-custom-args/captures/filevar-expanded.scala
@@ -1,7 +1,7 @@
 import language.experimental.captureChecking
 import language.experimental.modularity
 import compiletime.uninitialized
-import language.future // sepchecks on
+
 object test1:
   class File:
     def write(x: String): Unit = ???
diff --git a/tests/neg-custom-args/captures/i15772.scala b/tests/neg-custom-args/captures/i15772.scala
@@ -1,4 +1,4 @@
-import language.future // sepchecks on
+
 
 type Observe[T] = (T => Unit) -> Unit
 
diff --git a/tests/neg-custom-args/captures/i19330.scala b/tests/neg-custom-args/captures/i19330.scala
@@ -1,4 +1,4 @@
-import language.`3.7` // sepchecks on
+
 import language.experimental.captureChecking
 
 
diff --git a/tests/neg-custom-args/captures/i21442.scala b/tests/neg-custom-args/captures/i21442.scala
@@ -1,5 +1,5 @@
 import language.experimental.captureChecking
-import language.future // sepchecks on
+
 trait IO:
   def use(): Unit
 case class Boxed[+T](unbox: T)
diff --git a/tests/neg-custom-args/captures/i21614.scala b/tests/neg-custom-args/captures/i21614.scala
@@ -1,7 +1,7 @@
 import language.experimental.captureChecking
 import caps.Capability
 import caps.use
-import language.`3.7` // sepchecks on
+
 trait List[+T]:
   def map[U](f: T => U): List[U]
 
diff --git a/tests/neg-custom-args/captures/i22005.scala b/tests/neg-custom-args/captures/i22005.scala
@@ -1,4 +1,4 @@
-import language.future // sepchecks on
+
 import caps.*
 
 class IO
diff --git a/tests/neg-custom-args/captures/lazyref.scala b/tests/neg-custom-args/captures/lazyref.scala
@@ -1,4 +1,4 @@
-import language.future // sepchecks on
+
 class CC
 type Cap = CC^
 
diff --git a/tests/neg-custom-args/captures/outer-var.scala b/tests/neg-custom-args/captures/outer-var.scala
@@ -1,4 +1,4 @@
-import language.`3.7` // sepchecks on
+
 class CC
 type Cap = CC^
 
diff --git a/tests/neg-custom-args/captures/reaches.scala b/tests/neg-custom-args/captures/reaches.scala
@@ -1,4 +1,4 @@
-import caps.use; import language.`3.7` // sepchecks on
+import caps.use;
 import caps.consume
 class File:
   def write(): Unit = ???
diff --git a/tests/neg-custom-args/captures/reaches2.scala b/tests/neg-custom-args/captures/reaches2.scala
@@ -1,4 +1,4 @@
-import language.`3.8` // sepchecks on
+
 
 class List[+A]:
   def map[B](f: A -> B): List[B] = ???
diff --git a/tests/neg-custom-args/captures/sep-compose.scala b/tests/neg-custom-args/captures/sep-compose.scala
@@ -1,5 +1,5 @@
 import caps.cap
-import language.future // sepchecks on
+
 def seq1(x: () => Unit, y: () ->{x, cap} Unit): Unit =
   x(); y()
 
diff --git a/tests/neg-custom-args/captures/sep-use.scala b/tests/neg-custom-args/captures/sep-use.scala
@@ -1,5 +1,5 @@
 import caps.{cap, consume}
-import language.future // sepchecks on
+
 
 def test1(@consume io: Object^): Unit =
 
diff --git a/tests/neg-custom-args/captures/sep-use2.scala b/tests/neg-custom-args/captures/sep-use2.scala
@@ -1,4 +1,4 @@
-import language.future // sepchecks on
+
 import caps.consume
 
 def test1(@consume c: Object^, f: Object^ => Object^) =
diff --git a/tests/neg-custom-args/captures/sepchecks.scala b/tests/neg-custom-args/captures/sepchecks.scala
@@ -1,6 +1,6 @@
 import caps.Mutable
 import caps.cap
-import language.future // sepchecks on
+
 
 trait Rdr[T]:
   def get: T
diff --git a/tests/neg-custom-args/captures/sepchecks2.scala b/tests/neg-custom-args/captures/sepchecks2.scala
@@ -1,4 +1,4 @@
-import language.future // sepchecks on
+
 import caps.consume
 
 def foo(xs: List[() => Unit], y: Object^) = ???
diff --git a/tests/neg-custom-args/captures/sepchecks3.scala b/tests/neg-custom-args/captures/sepchecks3.scala
@@ -1,4 +1,4 @@
-import language.future // sepchecks on
+
 import caps.consume
 
 def foo(xs: List[() => Unit], y: Object^) = ???
diff --git a/tests/neg-custom-args/captures/shared-capability.scala b/tests/neg-custom-args/captures/shared-capability.scala
@@ -1,5 +1,5 @@
 
-import language.future // sepchecks on
+
 import caps.SharedCapability
 
 class Async extends SharedCapability
diff --git a/tests/neg-custom-args/captures/unsound-reach-2.scala b/tests/neg-custom-args/captures/unsound-reach-2.scala
@@ -1,4 +1,4 @@
-import language.experimental.captureChecking; import language.`3.7` // sepchecks on
+import language.experimental.captureChecking;
 trait Consumer[-T]:
   def apply(x: T): Unit
 
diff --git a/tests/neg-custom-args/captures/unsound-reach-3.scala b/tests/neg-custom-args/captures/unsound-reach-3.scala
@@ -1,4 +1,4 @@
-import language.future // sepchecks on
+
 import language.experimental.captureChecking
 import caps.consume
 
diff --git a/tests/neg-custom-args/captures/unsound-reach-4.scala b/tests/neg-custom-args/captures/unsound-reach-4.scala
@@ -1,6 +1,6 @@
 
 
-import language.future // sepchecks on
+
 import language.experimental.captureChecking;
 import caps.consume
 
diff --git a/tests/neg-custom-args/captures/unsound-reach-6.scala b/tests/neg-custom-args/captures/unsound-reach-6.scala
@@ -1,4 +1,4 @@
-import language.future // sepchecks on
+
 import caps.consume
 
 class IO
diff --git a/tests/neg-custom-args/captures/unsound-reach.scala b/tests/neg-custom-args/captures/unsound-reach.scala
@@ -1,4 +1,4 @@
-import language.experimental.captureChecking; import language.`3.7` // sepchecks on
+import language.experimental.captureChecking;
 trait File:
   def close(): Unit
 
diff --git a/tests/neg-custom-args/captures/vars.scala b/tests/neg-custom-args/captures/vars.scala
@@ -1,4 +1,4 @@
-import language.`3.7` // sepchecks on
+
 
 class CC
 type Cap = CC^
diff --git a/tests/pos-custom-args/captures/capt1.scala b/tests/pos-custom-args/captures/capt1.scala
@@ -1,4 +1,4 @@
-import language.future // sepchecks on
+
 import caps.unsafe.unsafeAssumeSeparate
 
 class C
diff --git a/tests/pos-custom-args/captures/cc-this.scala b/tests/pos-custom-args/captures/cc-this.scala
@@ -1,5 +1,5 @@
 import caps.consume
-import language.future // sepchecks on
+
 
 class Cap extends caps.Capability
 
diff --git a/tests/pos-custom-args/captures/i15749a.scala b/tests/pos-custom-args/captures/i15749a.scala
@@ -1,6 +1,6 @@
 import caps.cap
 import caps.use
-import language.`3.7` // sepchecks on
+
 
 class Unit
 object u extends Unit
diff --git a/tests/pos-custom-args/captures/lazyref.scala b/tests/pos-custom-args/captures/lazyref.scala
@@ -1,4 +1,4 @@
-import language.future // sepchecks on
+
 import caps.consume
 
 class Cap extends caps.Capability
diff --git a/tests/pos-custom-args/captures/reaches.scala b/tests/pos-custom-args/captures/reaches.scala
@@ -1,4 +1,4 @@
-import language.future // sepchecks on
+
 import caps.{use, consume}
 
 class C
diff --git a/tests/pos-custom-args/captures/sep-compose.scala b/tests/pos-custom-args/captures/sep-compose.scala
@@ -1,5 +1,5 @@
 import caps.cap
-import language.future // sepchecks on
+
 
 def seq1(x: () => Unit, y: () ->{x, cap} Unit): Unit =
   x(); y()
diff --git a/tests/pos-custom-args/captures/sep-eq.scala b/tests/pos-custom-args/captures/sep-eq.scala
@@ -1,6 +1,6 @@
 import caps.Mutable
 import caps.cap
-import language.future // sepchecks on
+
 
 extension (x: Object^)
   infix def eql (y: Object^{x, cap}): Boolean = x eq y
diff --git a/tests/pos-custom-args/captures/skolems2.scala b/tests/pos-custom-args/captures/skolems2.scala
@@ -1,4 +1,4 @@
-import language.future // sepchecks on
+
 import caps.consume
 
 def Test(@consume c: Object^, f: Object^ => Object^) =

Original file line number	Diff line number	Diff line change
`@@ -1225,7 +1225,7 @@ object Build {`
`1225`	`1225`	`settings(scala2LibraryBootstrappedSettings).`
`1226`	`1226`	`settings(`
`1227`	`1227`	`moduleName := "scala2-library-cc",`
`1228`		`- scalacOptions ++= Seq("-Ycheck:all", "-source", "3.7")`
	`1228`	`+ scalacOptions += "-Ycheck:all"`
`1229`	`1229`	`)`
`1230`	`1230`
`1231`	`1231`	`lazy val scala2LibraryBootstrappedSettings = Seq(`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		-import language.`3.7` // sepchecks on
	`1`	`+`
`2`	`2`	`trait Cap { def use(): Int }`
`3`	`3`
`4`	`4`	`def test1(): Unit = {`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import language.future // sepchecks on`
	`1`	`+`
`2`	`2`	`import caps.consume`
`3`	`3`
`4`	`4`	`trait Cap`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import language.future // sepchecks on`
	`1`	`+`
`2`	`2`	`import annotation.retains`
`3`	`3`	`class C`
`4`	`4`	`def f(x: C @retains(caps.cap), y: C): () -> C =`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import language.future // sepchecks on`
	`1`	`+`
`2`	`2`
`3`	`3`	`object boundary:`
`4`	`4`