Deprecate +(x: String): String on primitives

smarter · smarter · commit 0ec947511dcc · 2018-06-08T14:15:43.000+02:00
This is consistent with the deprecation of any2stringadd in scala#6315.
diff --git a/project/GenerateAnyVals.scala b/project/GenerateAnyVals.scala
@@ -146,7 +146,9 @@ import scala.language.implicitConversions"""
 
     def mkCoercions = numeric map (x => "def to%s: %s".format(x, x))
     def mkUnaryOps  = unaryOps map (x => "%s\n  def unary_%s : %s".format(x.doc, x.op, this opType I))
-    def mkStringOps = List("def +(x: String): String")
+    def mkStringOps = List(
+      """@deprecated("Adding a number and a String is deprecated. Convert the number to a String with `toString` first to call +", "2.13.0") def +(x: String): String"""
+    )
     def mkShiftOps  = (
       for (op <- shiftOps ; arg <- List(I, L)) yield
         "%s\n  def %s(x: %s): %s".format(op.doc, op.op, arg, this opType I)
diff --git a/src/library/scala/Byte.scala b/src/library/scala/Byte.scala
@@ -42,7 +42,7 @@ final abstract class Byte private extends AnyVal {
   /** Returns the negation of this value. */
   def unary_- : Int
 
-  def +(x: String): String
+  @deprecated("Adding a number and a String is deprecated. Convert the number to a String with `toString` first to call +", "2.13.0") def +(x: String): String
 
   /**
   * Returns this value bit-shifted left by the specified number of bits,
diff --git a/src/library/scala/Char.scala b/src/library/scala/Char.scala
@@ -42,7 +42,7 @@ final abstract class Char private extends AnyVal {
   /** Returns the negation of this value. */
   def unary_- : Int
 
-  def +(x: String): String
+  @deprecated("Adding a number and a String is deprecated. Convert the number to a String with `toString` first to call +", "2.13.0") def +(x: String): String
 
   /**
   * Returns this value bit-shifted left by the specified number of bits,
diff --git a/src/library/scala/Double.scala b/src/library/scala/Double.scala
@@ -33,7 +33,7 @@ final abstract class Double private extends AnyVal {
   /** Returns the negation of this value. */
   def unary_- : Double
 
-  def +(x: String): String
+  @deprecated("Adding a number and a String is deprecated. Convert the number to a String with `toString` first to call +", "2.13.0") def +(x: String): String
 
   /** Returns `true` if this value is equal to x, `false` otherwise. */
   def ==(x: Byte): Boolean
diff --git a/src/library/scala/Float.scala b/src/library/scala/Float.scala
@@ -33,7 +33,7 @@ final abstract class Float private extends AnyVal {
   /** Returns the negation of this value. */
   def unary_- : Float
 
-  def +(x: String): String
+  @deprecated("Adding a number and a String is deprecated. Convert the number to a String with `toString` first to call +", "2.13.0") def +(x: String): String
 
   /** Returns `true` if this value is equal to x, `false` otherwise. */
   def ==(x: Byte): Boolean
diff --git a/src/library/scala/Int.scala b/src/library/scala/Int.scala
@@ -42,7 +42,7 @@ final abstract class Int private extends AnyVal {
   /** Returns the negation of this value. */
   def unary_- : Int
 
-  def +(x: String): String
+  @deprecated("Adding a number and a String is deprecated. Convert the number to a String with `toString` first to call +", "2.13.0") def +(x: String): String
 
   /**
   * Returns this value bit-shifted left by the specified number of bits,
diff --git a/src/library/scala/Long.scala b/src/library/scala/Long.scala
@@ -42,7 +42,7 @@ final abstract class Long private extends AnyVal {
   /** Returns the negation of this value. */
   def unary_- : Long
 
-  def +(x: String): String
+  @deprecated("Adding a number and a String is deprecated. Convert the number to a String with `toString` first to call +", "2.13.0") def +(x: String): String
 
   /**
   * Returns this value bit-shifted left by the specified number of bits,
diff --git a/src/library/scala/Short.scala b/src/library/scala/Short.scala
@@ -42,7 +42,7 @@ final abstract class Short private extends AnyVal {
   /** Returns the negation of this value. */
   def unary_- : Int
 
-  def +(x: String): String
+  @deprecated("Adding a number and a String is deprecated. Convert the number to a String with `toString` first to call +", "2.13.0") def +(x: String): String
 
   /**
   * Returns this value bit-shifted left by the specified number of bits,
diff --git a/test/files/jvm/duration-tck.scala b/test/files/jvm/duration-tck.scala
@@ -151,7 +151,7 @@ object Test extends App {
     intercept[IllegalArgumentException] { mdur / 0.9 }
     intercept[IllegalArgumentException] { dur / 0.4 }
     intercept[IllegalArgumentException] { mdur / 0.4 }
-    Duration(x + unit.toString.toLowerCase)
+    Duration(x.toString + unit.toString.toLowerCase)
     Duration("-" + x + unit.toString.toLowerCase)
     intercept[IllegalArgumentException] { Duration("%.0f".format(x + 10000000d) + unit.toString.toLowerCase) }
     intercept[IllegalArgumentException] { Duration("-%.0f".format(x + 10000000d) + unit.toString.toLowerCase) }
diff --git a/test/files/jvm/sync-var.scala b/test/files/jvm/sync-var.scala
@@ -44,7 +44,7 @@ summers foreach { _.join() }
 
 val got = sum.get
 val expected = (n + 1) * n / 2
-println(got + " " + expected + " " + (got == expected))
+println(got.toString + " " + expected + " " + (got == expected))
 
 producers foreach { _.join() }
 
diff --git a/test/files/neg/numeric-add-string-warning.check b/test/files/neg/numeric-add-string-warning.check
@@ -0,0 +1,6 @@
+numeric-add-string-warning.scala:2: warning: method + in class Int is deprecated (since 2.13.0): Adding a number and a String is deprecated. Convert the number to a String with `toString` first to call +
+  val x = 4 + "2"
+            ^
+error: No warnings can be incurred under -Xfatal-warnings.
+one warning found
+one error found
diff --git a/test/files/neg/numeric-add-string-warning.flags b/test/files/neg/numeric-add-string-warning.flags
@@ -0,0 +1 @@
+-Xfatal-warnings -deprecation
diff --git a/test/files/neg/numeric-add-string-warning.scala b/test/files/neg/numeric-add-string-warning.scala
@@ -0,0 +1,3 @@
+object Test {
+  val x = 4 + "2"
+}
diff --git a/test/files/run/bridges.scala b/test/files/run/bridges.scala
@@ -7116,7 +7116,7 @@ object Test {
 
     if (errors > 0) {
       Console.println;
-      Console.println(errors + " error" + (if (errors > 1) "s" else ""));
+      Console.println(s"$errors error" + (if (errors > 1) "s" else ""));
     }
   }
 }
diff --git a/test/files/run/bugs.scala b/test/files/run/bugs.scala
@@ -481,7 +481,7 @@ object Test  {
 
     if (errors > 0) {
       Console.println;
-      Console.println(errors + " error" + (if (errors > 1) "s" else ""));
+      Console.println(s"$errors error" + (if (errors > 1) "s" else ""));
     }
   }
 }
diff --git a/test/files/run/fors.scala b/test/files/run/fors.scala
@@ -18,29 +18,29 @@ object Test extends App {
     println("\ntestOld")
 
     // lists
-    for (x <- xs) print(x + " "); println
+    for (x <- xs) print(s"$x "); println
     for (x <- xs;
-         if x % 2 == 0) print(x + " "); println
+         if x % 2 == 0) print(s"$x "); println
     for {x <- xs
-         if x % 2 == 0} print(x + " "); println
+         if x % 2 == 0} print(s"$x "); println
     var n = 0
     for (_ <- xs) n += 1; println(n)
-    for ((x, y) <- xs zip ys) print(x + " "); println
-    for (p @ (x, y) <- xs zip ys) print(p._1 + " "); println
+    for ((x, y) <- xs zip ys) print(s"$x "); println
+    for (p @ (x, y) <- xs zip ys) print(s"${p._1} "); println
 
     // iterators
-    for (x <- it) print(x + " "); println
+    for (x <- it) print(s"$x "); println
     for (x <- it;
-         if x % 2 == 0) print(x + " "); println
+         if x % 2 == 0) print(s"$x "); println
     for {x <- it
-         if x % 2 == 0} print(x + " "); println
+         if x % 2 == 0} print(s"$x "); println
 
     // arrays
-    for (x <- ar) print(x + " "); println
+    for (x <- ar) print(s"$x "); println
     for (x <- ar;
-         if x.toInt > 97) print(x + " "); println
+         if x.toInt > 97) print(s"$x "); println
     for {x <- ar
-         if x.toInt > 97} print(x + " "); println
+         if x.toInt > 97} print(s"$x "); println
 
   }
 
@@ -52,28 +52,28 @@ object Test extends App {
     // lists
     var n = 0
     for (_ <- xs) n += 1; println(n)
-    for ((x, y) <- xs zip ys) print(x + " "); println
-    for (p @ (x, y) <- xs zip ys) print(p._1 + " "); println
+    for ((x, y) <- xs zip ys) print(s"$x "); println
+    for (p @ (x, y) <- xs zip ys) print(s"${p._1} "); println
 
     // iterators
-    for (x <- it) print(x + " "); println
-    for (x <- it if x % 2 == 0) print(x + " "); println
-    for (x <- it; if x % 2 == 0) print(x + " "); println
+    for (x <- it) print(s"$x "); println
+    for (x <- it if x % 2 == 0) print(s"$x "); println
+    for (x <- it; if x % 2 == 0) print(s"$x "); println
     for (x <- it;
-         if x % 2 == 0) print(x + " "); println
+         if x % 2 == 0) print(s"$x "); println
     for (x <- it
-         if x % 2 == 0) print(x + " "); println
+         if x % 2 == 0) print(s"$x "); println
     for {x <- it
-         if x % 2 == 0} print(x + " "); println
+         if x % 2 == 0} print(s"$x "); println
     for (x <- it;
          y = 2
-         if x % y == 0) print(x + " "); println
+         if x % y == 0) print(s"$x "); println
     for {x <- it
          y = 2
-         if x % y == 0} print(x + " "); println
+         if x % y == 0} print(s"$x "); println
 
     // arrays
-    for (x <- ar) print(x + " "); println
+    for (x <- ar) print(s"$x "); println
 
   }
 
diff --git a/test/files/run/kmpSliceSearch.scala b/test/files/run/kmpSliceSearch.scala
@@ -54,7 +54,7 @@ object Test {
     )
     (haystacks zip needles) foreach {
       case (hay, nee) =>
-        println(hay.indexOfSlice(nee,2) + " " + hay.lastIndexOfSlice(nee,13))
+        println(s"${hay.indexOfSlice(nee,2)} ${hay.lastIndexOfSlice(nee,13)}")
     }
   }
 }
diff --git a/test/files/run/macro-auto-duplicate/Macros_1.scala b/test/files/run/macro-auto-duplicate/Macros_1.scala
@@ -8,10 +8,10 @@ object Macros {
     def defAndUseX(rhs: Tree) = {
       Block(List(ValDef(NoMods, newTermName("x"), TypeTree(), rhs)), x)
     }
-    val xi4 = defAndUseX(Literal(Constant(4)))
-    val xs2 = defAndUseX(Literal(Constant("2")))
-    c.Expr[String](Apply(Select(xi4, newTermName("$plus")), List(xs2)))
+    val xs2 = defAndUseX(Literal(Constant("4")))
+    val xi4 = defAndUseX(Literal(Constant(2)))
+    c.Expr[String](Apply(Select(xs2, newTermName("$plus")), List(x4)))
   }
 
   def foo = macro impl
-}
+}
diff --git a/test/files/run/map_test.scala b/test/files/run/map_test.scala
@@ -30,7 +30,7 @@ object Test extends App {
     i = 0
     while(i < 4712) {
       if (map.isDefinedAt(i))
-        print(i + "->" + map(i) + " ");
+        print(s"$i->${map(i)} ")
       i += 1
     }
     println("")
diff --git a/test/files/run/names-defaults.scala b/test/files/run/names-defaults.scala
@@ -119,13 +119,13 @@ object Test extends App {
 
 
   // vararg
-  def test5(a: Int, b: Int)(c: Int, d: String*) = a +", "+ d.toList
+  def test5(a: Int, b: Int)(c: Int, d: String*) = s"$a, ${d.toList}"
   println(test5(b = 1, a = 2)(3, "4", "4", "4"))
   println(test5(b = 1, a = 2)(c = 29))
 
 
   // tuple conversion
-  def foo(a: Int, b: Int)(c: (Int, String)) = a + c._1
+  def foo(a: Int, b: Int)(c: (Int, String)) = s"$a${c._1}"
   println(foo(b = 1, a = 2)(3, "4"))
 
 
@@ -406,10 +406,10 @@ object Test extends App {
   println(f8177(a = 1, 1))
 
   // DEFINITIONS
-  def test1(a: Int, b: String) = println(a +": "+ b)
-  def test2(u: Int, v: Int)(k: String, l: Int) = println(l +": "+ k +", "+ (u + v))
+  def test1(a: Int, b: String) = println(s"$a: $b")
+  def test2(u: Int, v: Int)(k: String, l: Int) = println(l.toString +": "+ k +", "+ (u + v))
 
-  def test3[T1, T2](a: Int, b: T1)(c: String, d: T2) = println(a +": "+ c +", "+ b +", "+ d)
+  def test3[T1, T2](a: Int, b: T1)(c: String, d: T2) = println(a.toString +": "+ c +", "+ b +", "+ d)
 
   def test4(a: Int) = {
     def inner(b: Int = a, c: String) = println(b +": "+ c)
@@ -425,13 +425,13 @@ object Test extends App {
 
 
 class Base {
-  def test1[T1, T2](a: Int = 100, b: T1)(c: T2, d: String = a +": "+ b)(e: T2 = c, f: Int) =
-    println(a +": "+ d +", "+ b +", "+ c +", "+ e +", "+ f)
+  def test1[T1, T2](a: Int = 100, b: T1)(c: T2, d: String = a.toString +": "+ b)(e: T2 = c, f: Int) =
+    println(a.toString +": "+ d +", "+ b +", "+ c +", "+ e +", "+ f)
 }
 
 class Sub1 extends Base {
   override def test1[U1, U2](b: Int, a: U1)(m: U2, r: String = "overridden")(o: U2, f: Int = 555) =
-    println(b +": "+ r +", "+ a +", "+ m +", "+ o +", "+ f)
+    println(b.toString +": "+ r +", "+ a +", "+ m +", "+ o +", "+ f)
 }
 
 
diff --git a/test/files/run/runtime.scala b/test/files/run/runtime.scala
@@ -191,7 +191,7 @@ object Test  {
 
     if (errors > 0) {
       Console.println;
-      Console.println(errors + " error" + (if (errors > 1) "s" else ""));
+      Console.println(s"$errors error" + (if (errors > 1) "s" else ""));
     }
   }
 }
diff --git a/test/files/run/t3346e.scala b/test/files/run/t3346e.scala
@@ -68,7 +68,7 @@ object Test extends App {
   println("qwe".filterMap((c: Char) => Some(c.toInt)))
   println("qwe".filterMap((c: Char) => Some(c)))
   println(Array(2, 0).filterMap((c: Int) => Some(c.toInt)).toList)
-  println(Seq(2, 0).filterMap((c: Int) => if (c < 2) Some(c + "!") else None))
+  println(Seq(2, 0).filterMap((c: Int) => if (c < 2) Some(s"$c!") else None))
   def test(i:Int) = Option(i)
   println(BitSet(2,0).filterMap(test))
 
diff --git a/test/files/run/t5356.scala b/test/files/run/t5356.scala
@@ -1,7 +1,7 @@
 
 import scala.language.{ reflectiveCalls }
 object Test {
-  def f(x: Any { def toInt: Int }) = println(x.toInt + " " + x.getClass.getName)
+  def f(x: Any { def toInt: Int }) = println(x.toInt.toString + " " + x.getClass.getName)
 
   def main(args: Array[String]): Unit = {
     f(1)
diff --git a/test/files/run/t6928-run.scala b/test/files/run/t6928-run.scala
@@ -1,5 +1,5 @@
 abstract class A( val someAs: A* ) {
-  override def toString = someAs.length + " As"
+  override def toString = someAs.length.toString + " As"
 }
 object B extends A(null, null, null)
 
diff --git a/test/files/run/unittest_iterator.scala b/test/files/run/unittest_iterator.scala
@@ -13,7 +13,7 @@ object Test {
     for (i <- it) {
       // sum of the groups == sum of the original
       val thisSum = ((it grouped i) map (_.sum)).to(LazyList).sum
-      assert(thisSum == itSum, thisSum + " != " + itSum)
+      assert(thisSum == itSum, s"$thisSum != $itSum" )
     }
 
     // grouped
diff --git a/test/files/run/vector1.scala b/test/files/run/vector1.scala
@@ -42,7 +42,7 @@ object Test {
 
     def assertVectorIndexed[V](a: Vector[V], label: String, start: Int, end: Int) = {
       val res = a
-      assert(res.length == (end-start), res.length+"!="+(end-start)+" ("+res+")")
+      assert(res.length == (end-start), res.length.toString+"!="+(end-start)+" ("+res+")")
       for (i <- start until end) {
         assert(res(i) == (label + i), ""+res(i)+"!="+(label + i))
       }
@@ -51,7 +51,7 @@ object Test {
 
     def assertVectorIterated[V](a: Vector[V], label: String, start: Int, end: Int) = {
       val res = a
-      assert(res.length == (end-start), res.length+"!="+(end-start)+" ("+res+")")
+      assert(res.length == (end-start), res.length.toString+"!="+(end-start)+" ("+res+")")
       var i = start
       var it = res.iterator
       while(it.hasNext) {
@@ -146,7 +146,7 @@ object Test {
       var i = 0
       var it = a
       while (i < N) {
-        assert(it.length == (N-i), it.length+" items at iteration "+i)
+        assert(it.length == (N-i), it.length.toString+" items at iteration "+i)
         val x = it(0)
         val y = it(N-i-1)
         assert(x == "a"+i, x+"!=a"+i)
@@ -170,7 +170,7 @@ object Test {
       var i = 0
       var it = a
       while (i < N) {
-        assert(it.length == (N-i), it.length+" items at iteration "+i)
+        assert(it.length == (N-i), it.length.toString+" items at iteration "+i)
         val x = it(0)
         val y = it(N-i-1)
 //        println("x " + x + "/" + i)
