summaryrefslogtreecommitdiff
path: root/test/files/neg/predef-masking.scala
diff options
context:
space:
mode:
authorJason Zaugg <jzaugg@gmail.com>2014-02-18 17:37:31 +0100
committerAdriaan Moors <adriaan.moors@typesafe.com>2014-02-18 15:41:26 -0800
commitbba01661ea629ff636a538226ad267a67d9dbfa7 (patch)
treec5e3b82bcc6bc28bbdc012825bb219334ed2b6f0 /test/files/neg/predef-masking.scala
parent3dbcb1b9d4daa5cba98747bbc66f898ba0f864fd (diff)
downloadscala-bba01661ea629ff636a538226ad267a67d9dbfa7.tar.gz
scala-bba01661ea629ff636a538226ad267a67d9dbfa7.tar.bz2
scala-bba01661ea629ff636a538226ad267a67d9dbfa7.zip
SI-8229 Source compatible name for implicit any2stringadd
To support the established pattern for disabling it for an compilation unit. Update scaladoc's knowledge of our "typeclasses". Leave a `private[scala]` version of `StringAdd` (public in bytecode) to ensure binary compatibility with 2.11.0-M8 for partest.
Diffstat (limited to 'test/files/neg/predef-masking.scala')
-rw-r--r--test/files/neg/predef-masking.scala2
1 files changed, 1 insertions, 1 deletions
diff --git a/test/files/neg/predef-masking.scala b/test/files/neg/predef-masking.scala
index 6f4f4859d0..67b69aa169 100644
--- a/test/files/neg/predef-masking.scala
+++ b/test/files/neg/predef-masking.scala
@@ -1,5 +1,5 @@
// Testing predef masking
-import Predef.{ StringAdd => _, _ }
+import Predef.{ any2stringadd => _, _ }
object StringPlusConfusion {
// Would love to do something about this error message, but by the