Merging upstream version 1.68.2+dfsg1.

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

1 files changed, 20 insertions, 0 deletions

diff --git a/tests/ui/issues/issue-3702-2.rs b/tests/ui/issues/issue-3702-2.rs
new file mode 100644
index 000000000..d47f6d248
--- /dev/null
+++ b/tests/ui/issues/issue-3702-2.rs
@@ -0,0 +1,20 @@
+pub trait ToPrimitive {
+    fn to_int(&self) -> isize { 0 }
+}
+
+impl ToPrimitive for i32 {}
+impl ToPrimitive for isize {}
+
+trait Add {
+    fn to_int(&self) -> isize;
+    fn add_dynamic(&self, other: &dyn Add) -> isize;
+}
+
+impl Add for isize {
+    fn to_int(&self) -> isize { *self }
+    fn add_dynamic(&self, other: &dyn Add) -> isize {
+        self.to_int() + other.to_int() //~ ERROR multiple applicable items in scope
+    }
+}
+
+fn main() { }