summaryrefslogtreecommitdiff
path: root/src/scaladoc
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 /src/scaladoc
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 'src/scaladoc')
-rw-r--r--src/scaladoc/scala/tools/nsc/doc/Settings.scala2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/scaladoc/scala/tools/nsc/doc/Settings.scala b/src/scaladoc/scala/tools/nsc/doc/Settings.scala
index 5ea1443a19..67529f4178 100644
--- a/src/scaladoc/scala/tools/nsc/doc/Settings.scala
+++ b/src/scaladoc/scala/tools/nsc/doc/Settings.scala
@@ -298,7 +298,7 @@ class Settings(error: String => Unit, val printMsg: String => Unit = println(_))
/** Common conversion targets that affect any class in Scala */
val commonConversionTargets = Set(
"scala.Predef.StringFormat",
- "scala.Predef.StringAdd",
+ "scala.Predef.any2stringadd",
"scala.Predef.ArrowAssoc",
"scala.Predef.Ensuring",
"scala.collection.TraversableOnce.alternateImplicit")