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/imports/issue-53269.rs b/tests/ui/imports/issue-53269.rs
new file mode 100644
index 000000000..1031d5071
--- /dev/null
+++ b/tests/ui/imports/issue-53269.rs
@@ -0,0 +1,11 @@
+// Ambiguity between a `macro_rules` macro and a non-existent import recovered as `Res::Err`
+
+macro_rules! mac { () => () }
+
+mod m {
+    use nonexistent_module::mac; //~ ERROR unresolved import `nonexistent_module`
+
+    mac!(); //~ ERROR `mac` is ambiguous
+}
+
+fn main() {}