diff options
| author | Seth Tisue <seth@tisue.net> | 2016-03-29 16:49:38 -0400 |
|---|---|---|
| committer | Seth Tisue <seth@tisue.net> | 2016-03-29 16:49:38 -0400 |
| commit | 201b8d1fd0b7f6b66a41cb7a3ea50082d1504812 (patch) | |
| tree | 0e077dfacd0bd07711a238ebbff104a887c00171 | |
| parent | a23d295a8bc515274d4f99223ece255b06470b55 (diff) | |
| parent | b6c3be63c3274a09579b1b4391deaa4f0f3c05e7 (diff) | |
| download | scala-201b8d1fd0b7f6b66a41cb7a3ea50082d1504812.tar.gz scala-201b8d1fd0b7f6b66a41cb7a3ea50082d1504812.tar.bz2 scala-201b8d1fd0b7f6b66a41cb7a3ea50082d1504812.zip | |
Merge pull request #5008 from janekdb/2.12.x-remove-Predef-error
Remove deprecated Predef.error
| -rw-r--r-- | src/library/scala/Predef.scala | 8 | ||||
| -rw-r--r-- | test/files/pos/t4365/a_1.scala | 2 | ||||
| -rw-r--r-- | test/files/pos/t4365/b_1.scala | 2 |
3 files changed, 3 insertions, 9 deletions
diff --git a/src/library/scala/Predef.scala b/src/library/scala/Predef.scala index 2f6d6511b2..58d43f8666 100644 --- a/src/library/scala/Predef.scala +++ b/src/library/scala/Predef.scala @@ -188,13 +188,7 @@ object Predef extends LowPriorityImplicits with DeprecatedPredef { /** @group utilities */ @inline def locally[T](x: T): T = x // to communicate intent and avoid unmoored statements - // errors and asserts ------------------------------------------------- - - // !!! Remove this when possible - ideally for 2.11. - // We are stuck with it a while longer because sbt's compiler interface - // still calls it as of 0.12.2. - @deprecated("Use `sys.error(message)` instead", "2.9.0") - def error(message: String): Nothing = sys.error(message) + // assertions --------------------------------------------------------- /** Tests an expression, throwing an `AssertionError` if false. * Calls to this method will not be generated if `-Xelide-below` diff --git a/test/files/pos/t4365/a_1.scala b/test/files/pos/t4365/a_1.scala index a24b57772d..e7466e0d48 100644 --- a/test/files/pos/t4365/a_1.scala +++ b/test/files/pos/t4365/a_1.scala @@ -9,7 +9,7 @@ trait SeqViewLike[+A, trait Transformed[+B] extends super[GenSeqViewLike].Transformed[B] abstract class AbstractTransformed[+B] extends Seq[B] with Transformed[B] { - def underlying: Coll = error("") + def underlying: Coll = sys.error("") } trait Reversed extends Transformed[A] with super[GenSeqViewLike].Reversed diff --git a/test/files/pos/t4365/b_1.scala b/test/files/pos/t4365/b_1.scala index e1423813f1..1158db6c32 100644 --- a/test/files/pos/t4365/b_1.scala +++ b/test/files/pos/t4365/b_1.scala @@ -10,7 +10,7 @@ self => trait Transformed[+B] { def length: Int = 0 - def apply(idx: Int): B = error("") + def apply(idx: Int): B = sys.error("") } trait Reversed extends Transformed[A] { |