Merging upstream version 1.68.2+dfsg1.

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

2 files changed, 21 insertions, 0 deletions

diff --git a/tests/ui/issues/issue-52141/auxiliary/some_crate.rs b/tests/ui/issues/issue-52141/auxiliary/some_crate.rs
new file mode 100644
index 000000000..087005849
--- /dev/null
+++ b/tests/ui/issues/issue-52141/auxiliary/some_crate.rs
@@ -0,0 +1,5 @@
+#![crate_type = "lib"]
+
+pub fn hello() {
+    println!("Hello, world!");
+}
diff --git a/tests/ui/issues/issue-52141/main.rs b/tests/ui/issues/issue-52141/main.rs
new file mode 100644
index 000000000..7eea1726c
--- /dev/null
+++ b/tests/ui/issues/issue-52141/main.rs
@@ -0,0 +1,16 @@
+// run-pass
+// aux-build:some_crate.rs
+// compile-flags:--extern some_crate
+// edition:2018
+
+use some_crate as some_name;
+
+mod foo {
+    pub use crate::some_name::*;
+}
+
+fn main() {
+    ::some_crate::hello();
+    some_name::hello();
+    foo::hello();
+}