Drop language.postfixOps as a default option in build and test

odersky · odersky · commit 740ac67285d9 · 2022-03-12T13:36:26.000+01:00
diff --git a/compiler/src/dotty/tools/backend/jvm/BytecodeWriters.scala b/compiler/src/dotty/tools/backend/jvm/BytecodeWriters.scala
@@ -100,7 +100,7 @@ trait BytecodeWriters {
       super.writeClass(label, jclassName, jclassBytes, outfile)
 
       val segments = jclassName.split("[./]")
-      val asmpFile = segments.foldLeft(baseDir: Path)(_ / _) changeExtension "asmp" toFile;
+      val asmpFile = segments.foldLeft(baseDir: Path)(_ / _).changeExtension("asmp").toFile
 
       asmpFile.parent.createDirectory()
       emitAsmp(jclassBytes, asmpFile)
@@ -131,7 +131,7 @@ trait BytecodeWriters {
       super.writeClass(label, jclassName, jclassBytes, outfile)
 
       val pathName = jclassName
-      val dumpFile = pathName.split("[./]").foldLeft(baseDir: Path) (_ / _) changeExtension "class" toFile;
+      val dumpFile = pathName.split("[./]").foldLeft(baseDir: Path) (_ / _).changeExtension("class").toFile
       dumpFile.parent.createDirectory()
       val outstream = new DataOutputStream(new FileOutputStream(dumpFile.path))
 
diff --git a/compiler/src/dotty/tools/dotc/config/PathResolver.scala b/compiler/src/dotty/tools/dotc/config/PathResolver.scala
@@ -30,7 +30,7 @@ object PathResolver {
   def ppcp(s: String): String = split(s) match {
     case Nil      => ""
     case Seq(x)   => x
-    case xs       => xs map ("\n" + _) mkString
+    case xs       => xs.map("\n" + _).mkString
   }
 
   /** Values found solely by inspecting environment or property variables.
diff --git a/compiler/test/dotty/tools/dotc/CompilationTests.scala b/compiler/test/dotty/tools/dotc/CompilationTests.scala
@@ -58,7 +58,6 @@ class CompilationTests {
       compileFile("tests/pos-special/kind-projector.scala", defaultOptions.and("-Ykind-projector")),
       compileFile("tests/pos-special/kind-projector-underscores.scala", defaultOptions.and("-Ykind-projector:underscores")),
       compileFile("tests/run/i5606.scala", defaultOptions.and("-Yretain-trees")),
-      compileFile("tests/pos-custom-args/i5498-postfixOps.scala", defaultOptions withoutLanguageFeature "postfixOps"),
       compileFile("tests/pos-custom-args/i8875.scala", defaultOptions.and("-Xprint:getters")),
       compileFile("tests/pos-custom-args/i9267.scala", defaultOptions.and("-Ystop-after:erasure")),
       compileFile("tests/pos-special/extend-java-enum.scala", defaultOptions.and("-source", "3.0-migration")),
@@ -180,7 +179,6 @@ class CompilationTests {
       compileFile("tests/neg-custom-args/kind-projector.scala", defaultOptions.and("-Ykind-projector")),
       compileFile("tests/neg-custom-args/kind-projector-underscores.scala", defaultOptions.and("-Ykind-projector:underscores")),
       compileFile("tests/neg-custom-args/typeclass-derivation2.scala", defaultOptions.and("-language:experimental.erasedDefinitions")),
-      compileFile("tests/neg-custom-args/i5498-postfixOps.scala", defaultOptions withoutLanguageFeature "postfixOps"),
       compileFile("tests/neg-custom-args/deptypes.scala", defaultOptions.and("-language:experimental.dependent")),
       compileFile("tests/neg-custom-args/matchable.scala", defaultOptions.and("-Xfatal-warnings", "-source", "future")),
       compileFile("tests/neg-custom-args/i7314.scala", defaultOptions.and("-Xfatal-warnings", "-source", "future")),
diff --git a/compiler/test/dotty/tools/vulpix/TestConfiguration.scala b/compiler/test/dotty/tools/vulpix/TestConfiguration.scala
@@ -62,7 +62,7 @@ object TestConfiguration {
 
   val yCheckOptions = Array("-Ycheck:all")
 
-  val commonOptions = Array("-indent", "-language:postfixOps") ++ checkOptions ++ noCheckOptions ++ yCheckOptions
+  val commonOptions = Array("-indent") ++ checkOptions ++ noCheckOptions ++ yCheckOptions
   val defaultOptions = TestFlags(basicClasspath, commonOptions)
   val unindentOptions = TestFlags(basicClasspath, Array("-no-indent") ++ checkOptions ++ noCheckOptions ++ yCheckOptions)
   val withCompilerOptions =
diff --git a/project/Build.scala b/project/Build.scala
@@ -170,7 +170,7 @@ object Build {
       "-unchecked",
       "-Xfatal-warnings",
       "-encoding", "UTF8",
-      "-language:existentials,higherKinds,implicitConversions,postfixOps"
+      "-language:existentials,higherKinds,implicitConversions"
     ),
 
     (Compile / compile / javacOptions) ++= Seq("-Xlint:unchecked", "-Xlint:deprecation"),
diff --git a/tests/neg/i12361.scala b/tests/neg/i12361.scala
@@ -1,3 +1,4 @@
+import language.postfixOps
 object Test {
     foo = macro Impls . foo [ U ] +=    // error  // error
 }
diff --git a/tests/neg/i14564.check b/tests/neg/i14564.check
@@ -0,0 +1,17 @@
+-- [E018] Syntax Error: tests/neg/i14564.scala:5:28 --------------------------------------------------------------------
+5 |def test = sum"${ List(42)* }" // error // error
+  |                            ^
+  |                            expression expected but [31m'}'[0m found
+  |
+  | longer explanation available when compiling with `-explain`
+-- [E008] Not Found Error: tests/neg/i14564.scala:5:26 -----------------------------------------------------------------
+5 |def test = sum"${ List(42)* }" // error // error
+  |                  ^^^^^^^^^
+  |                  value * is not a member of List[Int], but could be made available as an extension method.
+  |
+  |                  One of the following imports might make progress towards fixing the problem:
+  |
+  |                    import math.Fractional.Implicits.infixFractionalOps
+  |                    import math.Integral.Implicits.infixIntegralOps
+  |                    import math.Numeric.Implicits.infixNumericOps
+  |
diff --git a/tests/neg/i14564.scala b/tests/neg/i14564.scala
@@ -0,0 +1,6 @@
+import language.postfixOps as _
+
+extension (sc: StringContext) def sum(xs: Int*): String = xs.sum.toString
+
+def test = sum"${ List(42)* }" // error // error
+
diff --git a/tests/neg/i1672.scala b/tests/neg/i1672.scala
@@ -2,6 +2,6 @@
 class Test {
   implicit def compareComparables[T](x: T)(implicit ord: Ordering[T]) = // error: result type of implicit definition needs to be given explicitly
     new ord.OrderingOps(x)
-  class Bippy { def compare(y: Bippy) = util Random }
+  class Bippy { def compare(y: Bippy) = util.Random }
   () < () // error: value `<` is not a member of Unit
 }
diff --git a/tests/neg/i1707.scala b/tests/neg/i1707.scala
@@ -1,3 +1,4 @@
+import language.postfixOps
 object DepBug {
   class A {
     class B
diff --git a/tests/neg/i5498-postfixOps.check b/tests/neg/i5498-postfixOps.check
@@ -1,16 +1,16 @@
--- [E018] Syntax Error: tests/neg-custom-args/i5498-postfixOps.scala:4:10 ----------------------------------------------
+-- [E018] Syntax Error: tests/neg/i5498-postfixOps.scala:4:10 ----------------------------------------------------------
 4 |  1 second // error: usage of postfix operator
   |          ^
   |          expression expected but [31mend of statement[0m found
   |
   | longer explanation available when compiling with `-explain`
--- [E018] Syntax Error: tests/neg-custom-args/i5498-postfixOps.scala:6:37 ----------------------------------------------
+-- [E018] Syntax Error: tests/neg/i5498-postfixOps.scala:6:37 ----------------------------------------------------------
 6 |  Seq(1, 2).filter(List(1,2) contains) // error: usage of postfix operator // error
   |                                     ^
   |                                     expression expected but [31m')'[0m found
   |
   | longer explanation available when compiling with `-explain`
--- Error: tests/neg-custom-args/i5498-postfixOps.scala:6:0 -------------------------------------------------------------
+-- Error: tests/neg/i5498-postfixOps.scala:6:0 -------------------------------------------------------------------------
 6 |  Seq(1, 2).filter(List(1,2) contains) // error: usage of postfix operator // error
   |^
   |no implicit argument of type scala.concurrent.duration.DurationConversions.Classifier[Null] was found for parameter ev of method second in trait DurationConversions
diff --git a/tests/neg/i5498-postfixOps.scala b/tests/neg/i5498-postfixOps.scala
diff --git a/tests/neg/i7438.scala b/tests/neg/i7438.scala
@@ -1,3 +1,4 @@
+import language.postfixOps
 type Tr[+A]
 extension [A, B](tr: Tr[A]) inline def map(f: A => B): Tr[B] = ???
 
diff --git a/tests/neg/i9344.scala b/tests/neg/i9344.scala
@@ -1,4 +1,4 @@
-
+import language.postfixOps
 object Test {
   val I1: Int = 0 * * * 8 * 1 - 1 + 1 + // error
 }
diff --git a/tests/neg/parser-stability-7.scala b/tests/neg/parser-stability-7.scala
@@ -1,3 +1,4 @@
+import language.postfixOps
 class x0[x1] {
 def x2: x1
 }
diff --git a/tests/neg/t6124.scala b/tests/neg/t6124.scala
@@ -1,4 +1,4 @@
-
+import language.postfixOps
 trait T {
   def f = 3_14_E-2 // error
   def e = 3_14E-_2 // error
diff --git a/tests/pos-custom-args/i5498-postfixOps.scala b/tests/pos-custom-args/i5498-postfixOps.scala
diff --git a/tests/pos/i5498-postfixOps.scala b/tests/pos/i5498-postfixOps.scala
@@ -1,8 +1,9 @@
 import scala.concurrent.duration.*
 
+import scala.language.postfixOps
+
 def test() = {
-  // only OK since the defaultOptions in the TestConfiguration includes -language:postfixOps
   1 second
 
-  Seq(1, 2).filter(List(1,2) contains)
-}
+  Seq(1, 2) filter (List(1,2) contains) toList
+}
diff --git a/tests/pos/test-desugar.scala b/tests/pos/test-desugar.scala
@@ -1,3 +1,4 @@
+import language.postfixOps
 object desugar {
 
   // variables
diff --git a/tests/run/t8346.scala b/tests/run/t8346.scala
@@ -27,7 +27,7 @@ object Test extends App {
   inits foreach {case (name, singleton) =>
     print(s"${name}: ")
     val one = singleton(1)
-    println(Seq(2,3,4).scanLeft(one)(_ + _) map sVarInfo toList)
+    println(Seq(2,3,4).scanLeft(one)(_ + _).map(sVarInfo).toList)
   }
 
   println(s"ValueSet: ${sVarInfo(SomeEnum.values)}")

Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ object PathResolver {`
`30`	`30`	`def ppcp(s: String): String = split(s) match {`
`31`	`31`	`case Nil => ""`
`32`	`32`	`case Seq(x) => x`
`33`		`- case xs => xs map ("\n" + _) mkString`
	`33`	`+ case xs => xs.map("\n" + _).mkString`
`34`	`34`	`}`
`35`	`35`
`36`	`36`	`/** Values found solely by inspecting environment or property variables.`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+import language.postfixOps`
`1`	`2`	`object Test {`
`2`	`3`	`foo = macro Impls . foo [ U ] += // error // error`
`3`	`4`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,6 @@`
`2`	`2`	`class Test {`
`3`	`3`	`implicit def compareComparables[T](x: T)(implicit ord: Ordering[T]) = // error: result type of implicit definition needs to be given explicitly`
`4`	`4`	`new ord.OrderingOps(x)`
`5`		`- class Bippy { def compare(y: Bippy) = util Random }`
	`5`	`+ class Bippy { def compare(y: Bippy) = util.Random }`
`6`	`6`	() < () // error: value `<` is not a member of Unit
`7`	`7`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+import language.postfixOps`
`1`	`2`	`object DepBug {`
`2`	`3`	`class A {`
`3`	`4`	`class B`