closes #1693: improve implicit conversion disam...

closes #1693: improve implicit conversion disambiguation by
incorporating the expected type of the member that triggered the
conversion

back-ported fix by Martin in embeddings branch.

review by odersky (just in case it shouldn't have been back-ported)

1 files changed, 9 insertions, 0 deletions

diff --git a/test/files/pos/t1693.scala b/test/files/pos/t1693.scala
new file mode 100644
index 0000000000..f3615f4756
--- /dev/null
+++ b/test/files/pos/t1693.scala
@@ -0,0 +1,9 @@
+object Test {
+  class Foo
+  class SomeOps(x : Foo) { def foo(x: String) = 1 }
+  class OtherOps(x : Foo) { def foo(x: Int) = 1 }
+  implicit def mkSomeOps(x: Foo) : SomeOps = new SomeOps(x)
+  implicit def mkOtherOps(x: Foo) : OtherOps = new OtherOps(x)
+
+  (new Foo).foo(1)
+}
\ No newline at end of file