Merging upstream version 1.70.0+dfsg1.

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

3 files changed, 23 insertions, 0 deletions

diff --git a/tests/ui/use/use-mod.rs b/tests/ui/use/use-mod/use-mod.rs
index 87064c6a4..87064c6a4 100644
--- a/tests/ui/use/use-mod.rs
+++ b/tests/ui/use/use-mod/use-mod.rs
diff --git a/tests/ui/use/use-mod.stderr b/tests/ui/use/use-mod/use-mod.stderr
index 0cae5eb14..0cae5eb14 100644
--- a/tests/ui/use/use-mod.stderr
+++ b/tests/ui/use/use-mod/use-mod.stderr
diff --git a/tests/ui/use/use.rs b/tests/ui/use/use.rs
new file mode 100644
index 000000000..1beee4a51
--- /dev/null
+++ b/tests/ui/use/use.rs
@@ -0,0 +1,23 @@
+// run-pass
+
+#![allow(stable_features)]
+// pretty-expanded FIXME #23616
+
+#![allow(unused_imports)]
+#![feature(start, no_core, core)]
+#![no_core]
+
+extern crate std;
+extern crate std as zed;
+
+use std::str;
+use zed::str as x;
+
+use std::io::{self, Error as IoError, Result as IoResult};
+use std::error::{self as foo};
+mod baz {
+    pub use std::str as x;
+}
+
+#[start]
+pub fn start(_: isize, _: *const *const u8) -> isize { 0 }