Merging upstream version 1.68.2+dfsg1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 13 insertions, 0 deletions

diff --git a/tests/ui/methods/method-ambig-two-traits-with-default-method.rs b/tests/ui/methods/method-ambig-two-traits-with-default-method.rs
new file mode 100644
index 000000000..aa7094b9e
--- /dev/null
+++ b/tests/ui/methods/method-ambig-two-traits-with-default-method.rs
@@ -0,0 +1,13 @@
+// Test that we correctly report an ambiguity where two applicable traits
+// are in scope and the method being invoked is a default method not
+// defined directly in the impl.
+
+trait Foo { fn method(&self) {} }
+trait Bar { fn method(&self) {} }
+
+impl Foo for usize {}
+impl Bar for usize {}
+
+fn main() {
+    1_usize.method(); //~ ERROR E0034
+}