Merge branch 'master' into feature/collection-concurrent

Conflicts:
	src/library/scala/collection/JavaConversions.scala
	src/library/scala/collection/JavaConverters.scala

Add one test for concurrent map conversion.

1 files changed, 34 insertions, 0 deletions

diff --git a/test/scaladoc/run/SI-5373.scala b/test/scaladoc/run/SI-5373.scala
new file mode 100644
index 0000000000..af433a1844
--- /dev/null
+++ b/test/scaladoc/run/SI-5373.scala
@@ -0,0 +1,34 @@
+import scala.tools.nsc.doc.model._
+import scala.tools.partest.ScaladocModelTest
+
+object Test extends ScaladocModelTest {  
+
+  def code = """
+        import scala.annotation.bridge
+
+        package scala.test {
+
+          trait A {
+            def foo = ()
+          }
+
+          trait B {
+            @bridge()
+            def foo = ()
+          }
+
+          class C extends A with B
+        }
+    """
+
+  // no need for special settings
+  def scaladocSettings = ""
+    
+  def testModel(rootPackage: Package) = {
+    // get the quick access implicit defs in scope (_package(s), _class(es), _trait(s), object(s) _method(s), _value(s))
+    import access._
+
+    // just need to check the member exists, access methods will throw an error if there's a problem
+    rootPackage._package("scala")._package("test")._class("C")._method("foo")
+  }
+}
\ No newline at end of file