Merge commit '7ba38a0' into merge/2.11.x-to-2.12.x-20150129

Conflicts:
	build.number
	src/compiler/scala/tools/nsc/transform/ExtensionMethods.scala
	src/library/scala/collection/Iterator.scala
	versions.properties

1 files changed, 44 insertions, 0 deletions

diff --git a/test/files/run/t2866.scala b/test/files/run/t2866.scala
new file mode 100644
index 0000000000..8059107583
--- /dev/null
+++ b/test/files/run/t2866.scala
@@ -0,0 +1,44 @@
+// for 2.7.x compatibility
+
+object A {
+  implicit val one = 1
+}
+
+object Test extends App {
+
+  locally {
+    import A._
+    locally {
+      // assert(implicitly[Int] == 1) // error: could not find implicit value for parameter e: Int.
+                                     // !!! Why one A.one?
+      // (I assume you mean: why _not_ A.one? A.one is shadowed by local one.
+      // but the local one cannot be used yet because it does not have an explicit type.
+      implicit val one = 2
+      assert(implicitly[Int] == 2)
+      assert(one == 2)
+    }
+  }
+
+  locally {
+    import A._
+    implicit val one: Int = 2
+    assert(implicitly[Int] == 2)
+    assert(one == 2)
+  }
+
+  locally {
+    import A.one // warning: imported `one' is permanently hidden by definition of value one.
+                 // !!! Really?
+    //assert(implicitly[Int] == 1)
+    implicit val one = 2
+    assert(implicitly[Int] == 2) // !!! why not 2?
+    assert(one == 2)
+  }
+
+  locally {
+    import A.{one => _, _}
+    implicit val two = 2
+    assert(implicitly[Int] == 2) // not ambiguous in 2.8.0 nor im ambiguous in 2.7.6
+  }
+
+}