Merging upstream version 1.68.2+dfsg1.

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

3 files changed, 34 insertions, 0 deletions

diff --git a/tests/ui/issues/issue-41652/auxiliary/issue-41652-b.rs b/tests/ui/issues/issue-41652/auxiliary/issue-41652-b.rs
new file mode 100644
index 000000000..2ce21b036
--- /dev/null
+++ b/tests/ui/issues/issue-41652/auxiliary/issue-41652-b.rs
@@ -0,0 +1,6 @@
+pub trait Tr {
+    // Note: The function needs to be declared over multiple lines to reproduce
+    // the crash. DO NOT reformat.
+    fn f()
+        where Self: Sized;
+}
diff --git a/tests/ui/issues/issue-41652/issue-41652.rs b/tests/ui/issues/issue-41652/issue-41652.rs
new file mode 100644
index 000000000..d8a6f4c8d
--- /dev/null
+++ b/tests/ui/issues/issue-41652/issue-41652.rs
@@ -0,0 +1,14 @@
+// aux-build:issue-41652-b.rs
+
+extern crate issue_41652_b;
+
+struct S;
+
+impl issue_41652_b::Tr for S {
+    fn f() {
+        3.f()
+        //~^ ERROR can't call method `f` on ambiguous numeric type `{integer}`
+    }
+}
+
+fn main() {}
diff --git a/tests/ui/issues/issue-41652/issue-41652.stderr b/tests/ui/issues/issue-41652/issue-41652.stderr
new file mode 100644
index 000000000..1618f0f5a
--- /dev/null
+++ b/tests/ui/issues/issue-41652/issue-41652.stderr
@@ -0,0 +1,14 @@
+error[E0689]: can't call method `f` on ambiguous numeric type `{integer}`
+  --> $DIR/issue-41652.rs:9:11
+   |
+LL |         3.f()
+   |           ^
+   |
+help: you must specify a concrete type for this numeric value, like `i32`
+   |
+LL |         3_i32.f()
+   |         ~~~~~
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0689`.