Rename the (deprecated) implicit conversion methods in JavaConversions

Provide higher-priority implicit conversion methods whose names don't
clash with methods in JavaConverters. This allows implicit conversions
to work when importing both JavaConverters._ and JavaConversions._.

1 files changed, 14 insertions, 0 deletions

diff --git a/test/files/neg/t9684b.scala b/test/files/neg/t9684b.scala
new file mode 100644
index 0000000000..010e9d1b5d
--- /dev/null
+++ b/test/files/neg/t9684b.scala
@@ -0,0 +1,14 @@
+trait T1 {
+  import scala.collection.JavaConverters._
+  import scala.collection.JavaConversions._
+
+  null.asInstanceOf[java.util.Iterator[String]]: Iterator[String] // works
+  asScalaIterator(null)                                           // fails: asScalaIterator is imported twice.
+}
+
+trait T2 {
+  import scala.collection.JavaConversions.asScalaIterator
+
+  null.asInstanceOf[java.util.Iterator[String]]: Iterator[String] // works
+  asScalaIterator(null)                                           // works
+}