summaryrefslogtreecommitdiff
path: root/src/library/scala/collection/package.scala
diff options
context:
space:
mode:
authorSom Snytt <som.snytt@gmail.com>2016-03-25 23:53:00 -0700
committerLukas Rytz <lukas.rytz@gmail.com>2016-04-22 09:56:30 +0200
commit0c5b42d974fbd3703f29f0232e2c9215e41fb379 (patch)
tree0d2b5a511344ac305064f7c29e21c7378e35ebe4 /src/library/scala/collection/package.scala
parentf55dd2084eca97c576a982473ab6701f98fb79a7 (diff)
downloadscala-0c5b42d974fbd3703f29f0232e2c9215e41fb379.tar.gz
scala-0c5b42d974fbd3703f29f0232e2c9215e41fb379.tar.bz2
scala-0c5b42d974fbd3703f29f0232e2c9215e41fb379.zip
SI-9684 Deprecate JavaConversions
Implicit conversions are now in package convert as ImplicitConversions, ImplicitConversionsToScala and ImplicitConversionsToJava. Deprecated WrapAsJava, WrapAsScala and the values in package object. Improve documentation.
Diffstat (limited to 'src/library/scala/collection/package.scala')
-rw-r--r--src/library/scala/collection/package.scala8
1 files changed, 2 insertions, 6 deletions
diff --git a/src/library/scala/collection/package.scala b/src/library/scala/collection/package.scala
index 856f901b77..6df254c0e0 100644
--- a/src/library/scala/collection/package.scala
+++ b/src/library/scala/collection/package.scala
@@ -76,13 +76,9 @@ package scala
* The concrete parallel collections also have specific performance characteristics which are
* described in [[http://docs.scala-lang.org/overviews/parallel-collections/concrete-parallel-collections.html#performance-characteristics the parallel collections guide]]
*
- * === Converting between Java Collections ===
+ * === Converting to and from Java Collections ===
*
- * The [[scala.collection.JavaConversions]] object provides implicit defs that
- * will allow mostly seamless integration between APIs using Java Collections
- * and the Scala collections library.
- *
- * Alternatively the [[scala.collection.JavaConverters]] object provides a collection
+ * The [[scala.collection.JavaConverters]] object provides a collection
* of decorators that allow converting between Scala and Java collections using `asScala`
* and `asJava` methods.
*/