SI-6811 Remove primitive widenings and /:\

10 files changed, 15 insertions, 81 deletions

diff --git a/src/library/scala/Predef.scala b/src/library/scala/Predef.scala
index 9bb57877d9..357ea2f468 100644
--- a/src/library/scala/Predef.scala
+++ b/src/library/scala/Predef.scala
@@ -147,9 +147,6 @@ object Predef extends LowPriorityImplicits {
   @deprecated("Use `sys.exit(status)` instead", "2.9.0")
   def exit(status: Int): Nothing = sys.exit(status)
 
-  @deprecated("Use `formatString.format(args: _*)` or `arg.formatted(formatString)` instead", "2.9.0")
-  def format(text: String, xs: Any*) = augmentString(text).format(xs: _*)
-
   // errors and asserts -------------------------------------------------
 
   /** Tests an expression, throwing an `AssertionError` if false.
@@ -236,8 +233,6 @@ object Predef extends LowPriorityImplicits {
   final class Ensuring[A](val __resultOfEnsuring: A) extends AnyVal {
     // `__resultOfEnsuring` must be a public val to allow inlining.
     // See comments in ArrowAssoc for more.
-    @deprecated("Use `__resultOfEnsuring` instead", "2.10.0")
-    def x = __resultOfEnsuring
 
     def ensuring(cond: Boolean): A = { assert(cond); __resultOfEnsuring }
     def ensuring(cond: Boolean, msg: => Any): A = { assert(cond, msg); __resultOfEnsuring }
@@ -272,8 +267,6 @@ object Predef extends LowPriorityImplicits {
     // being confused why they get an ambiguous implicit conversion
     // error. (`foo.x` used to produce this error since both
     // any2Ensuring and any2ArrowAssoc pimped an `x` onto everything)
-    @deprecated("Use `__leftOfArrow` instead", "2.10.0")
-    def x = __leftOfArrow
 
     @inline def -> [B](y: B): Tuple2[A, B] = Tuple2(__leftOfArrow, y)
     def →[B](y: B): Tuple2[A, B] = ->(y)
@@ -335,33 +328,6 @@ object Predef extends LowPriorityImplicits {
   implicit def shortArrayOps(xs: Array[Short]): ArrayOps[Short]       = new ArrayOps.ofShort(xs)
   implicit def unitArrayOps(xs: Array[Unit]): ArrayOps[Unit]          = new ArrayOps.ofUnit(xs)
 
-  // Primitive Widenings --------------------------------------------------------------
-
-  @deprecated("Use `.toShort` for explicit conversion and `Byte.byte2short` for implicit conversion", "2.10.0") def byte2short(x: Byte): Short = x.toShort
-  @deprecated("Use `.toInt` for explicit conversion and `Byte.byte2int` for implicit conversion", "2.10.0") def byte2int(x: Byte): Int = x.toInt
-  @deprecated("Use `.toLong` for explicit conversion and `Byte.byte2long for implicit conversion", "2.10.0") def byte2long(x: Byte): Long = x.toLong
-  @deprecated("Use `.toFloat` for explicit conversion and `Byte.byte2float` for implicit conversion", "2.10.0") def byte2float(x: Byte): Float = x.toFloat
-  @deprecated("Use `.toDouble` for explicit conversion and `Byte.byte2double` for implicit conversion", "2.10.0") def byte2double(x: Byte): Double = x.toDouble
-
-  @deprecated("Use `.toInt` for explicit conversion and `Short.short2int` for implicit conversion", "2.10.0") def short2int(x: Short): Int = x.toInt
-  @deprecated("Use `.toLong` for explicit conversion and `Short.short2long` for implicit conversion", "2.10.0") def short2long(x: Short): Long = x.toLong
-  @deprecated("Use `.toFloat` for explicit conversion and `Short.short2float` for implicit conversion", "2.10.0") def short2float(x: Short): Float = x.toFloat
-  @deprecated("Use `.toDouble` for explicit conversion and `Short.short2double` for implicit conversion", "2.10.0") def short2double(x: Short): Double = x.toDouble
-
-  @deprecated("Use `.toInt` for explicit conversion and `Char.char2int` for implicit conversion", "2.10.0") def char2int(x: Char): Int = x.toInt
-  @deprecated("Use `.toLong` for explicit conversion and `Char.char2long` for implicit conversion", "2.10.0") def char2long(x: Char): Long = x.toLong
-  @deprecated("Use `.toFloat` for explicit conversion and `Char.char2float` for implicit conversion", "2.10.0") def char2float(x: Char): Float = x.toFloat
-  @deprecated("Use `.toDouble` for explicit conversion and `Char.char2double` for implicit conversion", "2.10.0") def char2double(x: Char): Double = x.toDouble
-
-  @deprecated("Use `.toLong` for explicit conversion and `Int.int2long` for implicit conversion", "2.10.0") def int2long(x: Int): Long = x.toLong
-  @deprecated("Use `.toFloat` for explicit conversion and `Int.int2float` for implicit conversion", "2.10.0") def int2float(x: Int): Float = x.toFloat
-  @deprecated("Use `.toDouble` for explicit conversion and `Int.int2double` for implicit conversion", "2.10.0") def int2double(x: Int): Double = x.toDouble
-
-  @deprecated("Use `.toFloat` for explicit conversion and `Long.long2float` for implicit conversion", "2.10.0") def long2float(x: Long): Float = x.toFloat
-  @deprecated("Use `.toDouble` for explicit conversion and `Long.long2double` for implicit conversion", "2.10.0") def long2double(x: Long): Double = x.toDouble
-
-  @deprecated("Use `.toDouble` for explicit conversion and `Float.float2double` for implicit conversion", "2.10.0") def float2double(x: Float): Double = x.toDouble
-
   // "Autoboxing" and "Autounboxing" ---------------------------------------------------
 
   implicit def byte2Byte(x: Byte)           = java.lang.Byte.valueOf(x)
@@ -402,9 +368,6 @@ object Predef extends LowPriorityImplicits {
   implicit def any2stringadd(x: Any) = new runtime.StringAdd(x)
   implicit def unaugmentString(x: StringOps): String = x.repr
 
-  @deprecated("Use `StringCanBuildFrom`", "2.10.0")
-  def stringCanBuildFrom: CanBuildFrom[String, Char, String] = StringCanBuildFrom
-
   implicit val StringCanBuildFrom: CanBuildFrom[String, Char, String] = new CanBuildFrom[String, Char, String] {
     def apply(from: String) = apply()
     def apply()             = mutable.StringBuilder.newBuilder
diff --git a/src/library/scala/collection/GenTraversableOnce.scala b/src/library/scala/collection/GenTraversableOnce.scala
index afaced4264..a05ee0fb54 100644
--- a/src/library/scala/collection/GenTraversableOnce.scala
+++ b/src/library/scala/collection/GenTraversableOnce.scala
@@ -119,19 +119,6 @@ trait GenTraversableOnce[+A] extends Any {
    */
   def fold[A1 >: A](z: A1)(op: (A1, A1) => A1): A1
 
-  /** A syntactic sugar for out of order folding. See `fold`.
-   *
-   * Example:
-   * {{{
-   *      scala> val a = LinkedList(1,2,3,4)
-   *      a: scala.collection.mutable.LinkedList[Int] = LinkedList(1, 2, 3, 4)
-   *
-   *      scala> val b = (a /:\ 5)(_+_)
-   *      b: Int = 15
-   * }}}*/
-  @deprecated("use fold instead", "2.10.0")
-  def /:\[A1 >: A](z: A1)(op: (A1, A1) => A1): A1 = fold(z)(op)
-
   /** Applies a binary operator to a start value and all elements of this $coll,
    *  going left to right.
    *
diff --git a/test/files/presentation/callcc-interpreter.check b/test/files/presentation/callcc-interpreter.check
index 3a08e2a2ea..dd3ee68e45 100644
--- a/test/files/presentation/callcc-interpreter.check
+++ b/test/files/presentation/callcc-interpreter.check
@@ -3,7 +3,7 @@ reload: CallccInterpreter.scala
 askTypeCompletion at CallccInterpreter.scala(51,38)
 ================================================================================
 [response] aksTypeCompletion at (51,38)
-retrieved 64 members
+retrieved 63 members
 [accessible:  true] `class AddcallccInterpreter.Add`
 [accessible:  true] `class AppcallccInterpreter.App`
 [accessible:  true] `class CcccallccInterpreter.Ccc`
@@ -50,7 +50,6 @@ retrieved 64 members
 [accessible:  true] `method wait()Unit`
 [accessible:  true] `method wait(x$1: Long)Unit`
 [accessible:  true] `method wait(x$1: Long, x$2: Int)Unit`
-[accessible:  true] `method x=> callccInterpreter.type`
 [accessible:  true] `method →[B](y: B)(callccInterpreter.type, B)`
 [accessible:  true] `object WrongcallccInterpreter.Wrong.type`
 [accessible:  true] `trait TermcallccInterpreter.Term`
diff --git a/test/files/presentation/ide-bug-1000349.check b/test/files/presentation/ide-bug-1000349.check
index 44a3207d75..7eeaddc054 100644
--- a/test/files/presentation/ide-bug-1000349.check
+++ b/test/files/presentation/ide-bug-1000349.check
@@ -3,7 +3,7 @@ reload: CompletionOnEmptyArgMethod.scala
 askTypeCompletion at CompletionOnEmptyArgMethod.scala(2,17)
 ================================================================================
 [response] aksTypeCompletion at (2,17)
-retrieved 37 members
+retrieved 36 members
 [accessible:  true] `method !=(x$1: Any)Boolean`
 [accessible:  true] `method !=(x$1: AnyRef)Boolean`
 [accessible:  true] `method ##()Int`
@@ -32,7 +32,6 @@ retrieved 37 members
 [accessible:  true] `method wait()Unit`
 [accessible:  true] `method wait(x$1: Long)Unit`
 [accessible:  true] `method wait(x$1: Long, x$2: Int)Unit`
-[accessible:  true] `method x=> Foo`
 [accessible:  true] `method →[B](y: B)(Foo, B)`
 [accessible:  true] `value __leftOfArrowFoo`
 [accessible:  true] `value __resultOfEnsuringFoo`
diff --git a/test/files/presentation/ide-bug-1000475.check b/test/files/presentation/ide-bug-1000475.check
index 34c3b557d8..01de4608ca 100644
--- a/test/files/presentation/ide-bug-1000475.check
+++ b/test/files/presentation/ide-bug-1000475.check
@@ -3,7 +3,7 @@ reload: Foo.scala
 askTypeCompletion at Foo.scala(3,7)
 ================================================================================
 [response] aksTypeCompletion at (3,7)
-retrieved 36 members
+retrieved 35 members
 [accessible:  true] `method !=(x$1: Any)Boolean`
 [accessible:  true] `method !=(x$1: AnyRef)Boolean`
 [accessible:  true] `method ##()Int`
@@ -29,7 +29,6 @@ retrieved 36 members
 [accessible:  true] `method wait()Unit`
 [accessible:  true] `method wait(x$1: Long)Unit`
 [accessible:  true] `method wait(x$1: Long, x$2: Int)Unit`
-[accessible:  true] `method x=> Object`
 [accessible:  true] `method →[B](y: B)(Object, B)`
 [accessible:  true] `value __leftOfArrowObject`
 [accessible:  true] `value __resultOfEnsuringObject`
@@ -41,7 +40,7 @@ retrieved 36 members
 askTypeCompletion at Foo.scala(6,10)
 ================================================================================
 [response] aksTypeCompletion at (6,10)
-retrieved 36 members
+retrieved 35 members
 [accessible:  true] `method !=(x$1: Any)Boolean`
 [accessible:  true] `method !=(x$1: AnyRef)Boolean`
 [accessible:  true] `method ##()Int`
@@ -67,7 +66,6 @@ retrieved 36 members
 [accessible:  true] `method wait()Unit`
 [accessible:  true] `method wait(x$1: Long)Unit`
 [accessible:  true] `method wait(x$1: Long, x$2: Int)Unit`
-[accessible:  true] `method x=> Object`
 [accessible:  true] `method →[B](y: B)(Object, B)`
 [accessible:  true] `value __leftOfArrowObject`
 [accessible:  true] `value __resultOfEnsuringObject`
@@ -79,7 +77,7 @@ retrieved 36 members
 askTypeCompletion at Foo.scala(7,7)
 ================================================================================
 [response] aksTypeCompletion at (7,7)
-retrieved 36 members
+retrieved 35 members
 [accessible:  true] `method !=(x$1: Any)Boolean`
 [accessible:  true] `method !=(x$1: AnyRef)Boolean`
 [accessible:  true] `method ##()Int`
@@ -105,7 +103,6 @@ retrieved 36 members
 [accessible:  true] `method wait()Unit`
 [accessible:  true] `method wait(x$1: Long)Unit`
 [accessible:  true] `method wait(x$1: Long, x$2: Int)Unit`
-[accessible:  true] `method x=> Object`
 [accessible:  true] `method →[B](y: B)(Object, B)`
 [accessible:  true] `value __leftOfArrowObject`
 [accessible:  true] `value __resultOfEnsuringObject`
diff --git a/test/files/presentation/ide-bug-1000531.check b/test/files/presentation/ide-bug-1000531.check
index 6c3892d272..7fa550179f 100644
--- a/test/files/presentation/ide-bug-1000531.check
+++ b/test/files/presentation/ide-bug-1000531.check
@@ -3,7 +3,7 @@ reload: CrashOnLoad.scala
 askTypeCompletion at CrashOnLoad.scala(6,12)
 ================================================================================
 [response] aksTypeCompletion at (6,12)
-retrieved 126 members
+retrieved 124 members
 [accessible:  true] `class GroupedIteratorIterator[B]#GroupedIterator`
 [accessible:  true] `method !=(x$1: Any)Boolean`
 [accessible:  true] `method !=(x$1: AnyRef)Boolean`
@@ -12,7 +12,6 @@ retrieved 126 members
 [accessible:  true] `method ++[B >: B](that: => scala.collection.GenTraversableOnce[B])Iterator[B]`
 [accessible:  true] `method ->[B](y: B)(java.util.Iterator[B], B)`
 [accessible:  true] `method /:[B](z: B)(op: (B, B) => B)B`
-[accessible:  true] `method /:\[A1 >: B](z: A1)(op: (A1, A1) => A1)A1`
 [accessible:  true] `method :\[B](z: B)(op: (B, B) => B)B`
 [accessible:  true] `method ==(x$1: Any)Boolean`
 [accessible:  true] `method ==(x$1: AnyRef)Boolean`
@@ -115,7 +114,6 @@ retrieved 126 members
 [accessible:  true] `method wait(x$1: Long)Unit`
 [accessible:  true] `method wait(x$1: Long, x$2: Int)Unit`
 [accessible:  true] `method withFilter(p: B => Boolean)Iterator[B]`
-[accessible:  true] `method x=> java.util.Iterator[B]`
 [accessible:  true] `method zipAll[B, A1 >: B, B1 >: B](that: Iterator[B], thisElem: A1, thatElem: B1)Iterator[(A1, B1)]`
 [accessible:  true] `method zipWithIndex=> Iterator[(B, Int)]`
 [accessible:  true] `method zip[B](that: Iterator[B])Iterator[(B, B)]`
diff --git a/test/files/presentation/implicit-member.check b/test/files/presentation/implicit-member.check
index 05d6f61699..7b4f792bf3 100644
--- a/test/files/presentation/implicit-member.check
+++ b/test/files/presentation/implicit-member.check
@@ -3,7 +3,7 @@ reload: ImplicitMember.scala
 askTypeCompletion at ImplicitMember.scala(7,7)
 ================================================================================
 [response] aksTypeCompletion at (7,7)
-retrieved 39 members
+retrieved 38 members
 [accessible:  true] `class AppliedImplicitImplicit.AppliedImplicit`
 [accessible:  true] `method !=(x$1: Any)Boolean`
 [accessible:  true] `method !=(x$1: AnyRef)Boolean`
@@ -33,7 +33,6 @@ retrieved 39 members
 [accessible:  true] `method wait()Unit`
 [accessible:  true] `method wait(x$1: Long)Unit`
 [accessible:  true] `method wait(x$1: Long, x$2: Int)Unit`
-[accessible:  true] `method x=> Implicit.type`
 [accessible:  true] `method →[B](y: B)(Implicit.type, B)`
 [accessible:  true] `value __leftOfArrowImplicit.type`
 [accessible:  true] `value __resultOfEnsuringImplicit.type`
diff --git a/test/files/presentation/ping-pong.check b/test/files/presentation/ping-pong.check
index b666d51de5..c85f6cc21a 100644
--- a/test/files/presentation/ping-pong.check
+++ b/test/files/presentation/ping-pong.check
@@ -3,7 +3,7 @@ reload: PingPong.scala
 askTypeCompletion at PingPong.scala(10,23)
 ================================================================================
 [response] aksTypeCompletion at (10,23)
-retrieved 40 members
+retrieved 39 members
 [accessible:  true] `method !=(x$1: Any)Boolean`
 [accessible:  true] `method !=(x$1: AnyRef)Boolean`
 [accessible:  true] `method ##()Int`
@@ -30,7 +30,6 @@ retrieved 40 members
 [accessible:  true] `method wait()Unit`
 [accessible:  true] `method wait(x$1: Long)Unit`
 [accessible:  true] `method wait(x$1: Long, x$2: Int)Unit`
-[accessible:  true] `method x=> Pong`
 [accessible:  true] `method →[B](y: B)(Pong, B)`
 [accessible:  true] `value __leftOfArrowPong`
 [accessible:  true] `value __resultOfEnsuringPong`
@@ -44,7 +43,7 @@ retrieved 40 members
 askTypeCompletion at PingPong.scala(19,20)
 ================================================================================
 [response] aksTypeCompletion at (19,20)
-retrieved 40 members
+retrieved 39 members
 [accessible:  true] `method !=(x$1: Any)Boolean`
 [accessible:  true] `method !=(x$1: AnyRef)Boolean`
 [accessible:  true] `method ##()Int`
@@ -73,7 +72,6 @@ retrieved 40 members
 [accessible:  true] `method wait()Unit`
 [accessible:  true] `method wait(x$1: Long)Unit`
 [accessible:  true] `method wait(x$1: Long, x$2: Int)Unit`
-[accessible:  true] `method x=> Ping`
 [accessible:  true] `method →[B](y: B)(Ping, B)`
 [accessible:  true] `value __leftOfArrowPing`
 [accessible:  true] `value __resultOfEnsuringPing`
diff --git a/test/files/presentation/t5708.check b/test/files/presentation/t5708.check
index c6d4762635..572f404cf4 100644
--- a/test/files/presentation/t5708.check
+++ b/test/files/presentation/t5708.check
@@ -3,7 +3,7 @@ reload: Completions.scala
 askTypeCompletion at Completions.scala(17,9)
 ================================================================================
 [response] aksTypeCompletion at (17,9)
-retrieved 44 members
+retrieved 43 members
 [accessible:  true] `lazy value fooInt`
 [accessible:  true] `method !=(x$1: Any)Boolean`
 [accessible:  true] `method !=(x$1: AnyRef)Boolean`
@@ -31,7 +31,6 @@ retrieved 44 members
 [accessible:  true] `method wait()Unit`
 [accessible:  true] `method wait(x$1: Long)Unit`
 [accessible:  true] `method wait(x$1: Long, x$2: Int)Unit`
-[accessible:  true] `method x=> test.Compat.type`
 [accessible:  true] `method →[B](y: B)(test.Compat.type, B)`
 [accessible:  true] `value CONST_STRINGString("constant")`
 [accessible:  true] `value __leftOfArrowtest.Compat.type`
diff --git a/test/files/presentation/visibility.check b/test/files/presentation/visibility.check
index 3026e58f7e..87b4463bf7 100644
--- a/test/files/presentation/visibility.check
+++ b/test/files/presentation/visibility.check
@@ -3,7 +3,7 @@ reload: Completions.scala
 askTypeCompletion at Completions.scala(14,12)
 ================================================================================
 [response] aksTypeCompletion at (14,12)
-retrieved 42 members
+retrieved 41 members
 [accessible:  true] `method !=(x$1: Any)Boolean`
 [accessible:  true] `method !=(x$1: AnyRef)Boolean`
 [accessible:  true] `method ##()Int`
@@ -36,7 +36,6 @@ retrieved 42 members
 [accessible:  true] `method wait()Unit`
 [accessible:  true] `method wait(x$1: Long)Unit`
 [accessible:  true] `method wait(x$1: Long, x$2: Int)Unit`
-[accessible:  true] `method x=> accessibility.Foo`
 [accessible:  true] `method →[B](y: B)(accessibility.Foo, B)`
 [accessible:  true] `value __leftOfArrowaccessibility.Foo`
 [accessible:  true] `value __resultOfEnsuringaccessibility.Foo`
@@ -47,7 +46,7 @@ retrieved 42 members
 askTypeCompletion at Completions.scala(16,11)
 ================================================================================
 [response] aksTypeCompletion at (16,11)
-retrieved 42 members
+retrieved 41 members
 [accessible:  true] `method !=(x$1: Any)Boolean`
 [accessible:  true] `method !=(x$1: AnyRef)Boolean`
 [accessible:  true] `method ##()Int`
@@ -81,7 +80,6 @@ retrieved 42 members
 [accessible:  true] `method wait()Unit`
 [accessible:  true] `method wait(x$1: Long)Unit`
 [accessible:  true] `method wait(x$1: Long, x$2: Int)Unit`
-[accessible:  true] `method x=> accessibility.Foo`
 [accessible:  true] `method →[B](y: B)(accessibility.Foo, B)`
 [accessible:  true] `value __leftOfArrowaccessibility.Foo`
 [accessible:  true] `value __resultOfEnsuringaccessibility.Foo`
@@ -91,7 +89,7 @@ retrieved 42 members
 askTypeCompletion at Completions.scala(22,11)
 ================================================================================
 [response] aksTypeCompletion at (22,11)
-retrieved 42 members
+retrieved 41 members
 [accessible:  true] `method !=(x$1: Any)Boolean`
 [accessible:  true] `method !=(x$1: AnyRef)Boolean`
 [accessible:  true] `method ##()Int`
@@ -124,7 +122,6 @@ retrieved 42 members
 [accessible:  true] `method wait()Unit`
 [accessible:  true] `method wait(x$1: Long)Unit`
 [accessible:  true] `method wait(x$1: Long, x$2: Int)Unit`
-[accessible:  true] `method x=> accessibility.AccessibilityChecks`
 [accessible:  true] `method →[B](y: B)(accessibility.AccessibilityChecks, B)`
 [accessible:  true] `value __leftOfArrowaccessibility.AccessibilityChecks`
 [accessible:  true] `value __resultOfEnsuringaccessibility.AccessibilityChecks`
@@ -135,7 +132,7 @@ retrieved 42 members
 askTypeCompletion at Completions.scala(28,10)
 ================================================================================
 [response] aksTypeCompletion at (28,10)
-retrieved 42 members
+retrieved 41 members
 [accessible:  true] `method !=(x$1: Any)Boolean`
 [accessible:  true] `method !=(x$1: AnyRef)Boolean`
 [accessible:  true] `method ##()Int`
@@ -164,7 +161,6 @@ retrieved 42 members
 [accessible:  true] `method wait()Unit`
 [accessible:  true] `method wait(x$1: Long)Unit`
 [accessible:  true] `method wait(x$1: Long, x$2: Int)Unit`
-[accessible:  true] `method x=> accessibility.Foo`
 [accessible:  true] `method →[B](y: B)(accessibility.Foo, B)`
 [accessible:  true] `value __leftOfArrowaccessibility.Foo`
 [accessible:  true] `value __resultOfEnsuringaccessibility.Foo`
@@ -179,7 +175,7 @@ retrieved 42 members
 askTypeCompletion at Completions.scala(37,8)
 ================================================================================
 [response] aksTypeCompletion at (37,8)
-retrieved 42 members
+retrieved 41 members
 [accessible:  true] `method !=(x$1: Any)Boolean`
 [accessible:  true] `method !=(x$1: AnyRef)Boolean`
 [accessible:  true] `method ##()Int`
@@ -207,7 +203,6 @@ retrieved 42 members
 [accessible:  true] `method wait()Unit`
 [accessible:  true] `method wait(x$1: Long)Unit`
 [accessible:  true] `method wait(x$1: Long, x$2: Int)Unit`
-[accessible:  true] `method x=> accessibility.Foo`
 [accessible:  true] `method →[B](y: B)(accessibility.Foo, B)`
 [accessible:  true] `value __leftOfArrowaccessibility.Foo`
 [accessible:  true] `value __resultOfEnsuringaccessibility.Foo`