Merging upstream version 1.68.2+dfsg1.

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

1 files changed, 19 insertions, 0 deletions

diff --git a/tests/ui/issues/issue-18446.rs b/tests/ui/issues/issue-18446.rs
new file mode 100644
index 000000000..a2e238da0
--- /dev/null
+++ b/tests/ui/issues/issue-18446.rs
@@ -0,0 +1,19 @@
+// Test that name clashes between the method in an impl for the type
+// and the method in the trait when both are in the same scope.
+
+trait T {
+    fn foo(&self);
+}
+
+impl<'a> dyn T + 'a {
+    fn foo(&self) {}
+}
+
+impl T for i32 {
+    fn foo(&self) {}
+}
+
+fn main() {
+    let x: &dyn T = &0i32;
+    x.foo(); //~ ERROR multiple applicable items in scope [E0034]
+}