Drop modularity import from tests that no longer need it.

odersky · odersky · commit 3cff3be904df · 2024-09-28T19:20:17.000+02:00
diff --git a/tests/neg/cb-companion-leaks.scala b/tests/neg/cb-companion-leaks.scala
@@ -1,4 +1,4 @@
-//> using options -language:experimental.modularity -source future -explain
+//> using options -language:experimental.modularity -explain
 
 class C[Self]
 
diff --git a/tests/neg/deferred-givens.scala b/tests/neg/deferred-givens.scala
@@ -1,4 +1,4 @@
-//> using options -language:experimental.modularity -source future
+
 import compiletime.deferred
 
 class Ctx
diff --git a/tests/neg/deferredSummon.scala b/tests/neg/deferredSummon.scala
@@ -1,4 +1,4 @@
-//> using options -language:experimental.modularity
+
 
 object Test:
   given Int = compiletime.deferred // error
diff --git a/tests/pos-custom-args/captures/logger.scala b/tests/pos-custom-args/captures/logger.scala
@@ -1,5 +1,4 @@
 import language.experimental.saferExceptions
-import language.experimental.modularity
 
 class FileSystem extends caps.Capability
 
diff --git a/tests/pos-custom-args/captures/nested-classes.scala b/tests/pos-custom-args/captures/nested-classes.scala
@@ -1,5 +1,4 @@
 import language.experimental.captureChecking
-import language.experimental.modularity
 import annotation.{capability, constructorOnly}
 
 class IO extends caps.Capability
diff --git a/tests/pos/FromString-cb-companion.scala b/tests/pos/FromString-cb-companion.scala
@@ -1,4 +1,4 @@
-//> using options -language:experimental.modularity -source future
+//> using options -language:experimental.modularity
 
 trait FromString[Self]:
   def fromString(s: String): Self
diff --git a/tests/pos/FromString-typeparam.scala b/tests/pos/FromString-typeparam.scala
@@ -1,4 +1,3 @@
-//> using options -language:experimental.modularity -source future
 
 trait FromString[A]:
   def fromString(s: String): A
diff --git a/tests/pos/cb-companion-joins.scala b/tests/pos/cb-companion-joins.scala
@@ -1,5 +1,4 @@
 import language.experimental.modularity
-import language.future
 
 trait M[Self]:
   extension (x: Self) def combine (y: Self): String
diff --git a/tests/pos/deferred-givens-singletons.scala b/tests/pos/deferred-givens-singletons.scala
@@ -1,4 +1,4 @@
-//> using options -language:experimental.modularity -source future
+// //> using options -language:experimental.modularity -source future
 import compiletime.*
 
 trait A:
diff --git a/tests/pos/deferred-givens.scala b/tests/pos/deferred-givens.scala
@@ -1,4 +1,4 @@
-//> using options -language:experimental.modularity -source future
+
 import compiletime.*
 class Ord[Elem]
 given Ord[Double]()
diff --git a/tests/pos/dep-context-bounds.scala b/tests/pos/dep-context-bounds.scala
@@ -1,4 +1,4 @@
-//> using options -language:experimental.modularity -source future
+//> using options -language:experimental.modularity
 trait A:
   type Self
 
diff --git a/tests/pos/i21189-alt.scala b/tests/pos/i21189-alt.scala
@@ -1,5 +1,3 @@
-//> using options -source:future -language:experimental.modularity
-
 class MySortedSet[T : Ord] extends SortedSet[T]
 
 trait Ord[T]
diff --git a/tests/pos/i21189.scala b/tests/pos/i21189.scala
@@ -1,5 +1,3 @@
-//> using options -source:future -language:experimental.modularity
-
 class MySortedSet[T : Ord] extends SortedSet[T]
 
 trait Ord[T]
diff --git a/tests/pos/typeclasses-arrow0.scala b/tests/pos/typeclasses-arrow0.scala
@@ -1,5 +1,3 @@
-//> using options -language:experimental.modularity -source future
-
 class Common:
 
   trait Ord[A]:
diff --git a/tests/run/Providers.scala b/tests/run/Providers.scala
@@ -1,4 +1,3 @@
-import language.experimental.modularity
 import compiletime.constValue
 import compiletime.ops.int.S
 
diff --git a/tests/run/byname-given.scala b/tests/run/byname-given.scala
@@ -1,5 +1,3 @@
-//> using options -language:experimental.modularity -source future
-
 @main def Test =
   var x: Int = 0
   given () => Int = x

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-//> using options -language:experimental.modularity -source future -explain`
	`1`	`+//> using options -language:experimental.modularity -explain`
`2`	`2`
`3`	`3`	`class C[Self]`
`4`	`4`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-//> using options -language:experimental.modularity -source future`
	`1`	`+`
`2`	`2`	`import compiletime.deferred`
`3`	`3`
`4`	`4`	`class Ctx`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-//> using options -language:experimental.modularity`
	`1`	`+`
`2`	`2`
`3`	`3`	`object Test:`
`4`	`4`	`given Int = compiletime.deferred // error`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`import language.experimental.saferExceptions`
`2`		`-import language.experimental.modularity`
`3`	`2`
`4`	`3`	`class FileSystem extends caps.Capability`
`5`	`4`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`import language.experimental.captureChecking`
`2`		`-import language.experimental.modularity`
`3`	`2`	`import annotation.{capability, constructorOnly}`
`4`	`3`
`5`	`4`	`class IO extends caps.Capability`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-//> using options -language:experimental.modularity -source future`
`2`	`1`
`3`	`2`	`trait FromString[A]:`
`4`	`3`	`def fromString(s: String): A`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`import language.experimental.modularity`
`2`		`-import language.future`
`3`	`2`
`4`	`3`	`trait M[Self]:`
`5`	`4`	`extension (x: Self) def combine (y: Self): String`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-//> using options -language:experimental.modularity -source future`
	`1`	`+// //> using options -language:experimental.modularity -source future`
`2`	`2`	`import compiletime.*`
`3`	`3`
`4`	`4`	`trait A:`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`-//> using options -source:future -language:experimental.modularity`
`2`		`-`
`3`	`1`	`class MySortedSet[T : Ord] extends SortedSet[T]`
`4`	`2`
`5`	`3`	`trait Ord[T]`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`-//> using options -language:experimental.modularity -source future`
`2`		`-`
`3`	`1`	`class Common:`
`4`	`2`
`5`	`3`	`trait Ord[A]:`