Merging upstream version 1.68.2+dfsg1.

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

1 files changed, 11 insertions, 0 deletions

diff --git a/tests/ui/methods/method-ambig-two-traits-cross-crate.rs b/tests/ui/methods/method-ambig-two-traits-cross-crate.rs
new file mode 100644
index 000000000..006e315b0
--- /dev/null
+++ b/tests/ui/methods/method-ambig-two-traits-cross-crate.rs
@@ -0,0 +1,11 @@
+// Test an ambiguity scenario where one copy of the method is available
+// from a trait imported from another crate.
+
+// aux-build:ambig_impl_2_lib.rs
+extern crate ambig_impl_2_lib;
+use ambig_impl_2_lib::Me;
+trait Me2 {
+    fn me(&self) -> usize;
+}
+impl Me2 for usize { fn me(&self) -> usize { *self } }
+fn main() { 1_usize.me(); } //~ ERROR E0034