Merging upstream version 1.68.2+dfsg1.

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

2 files changed, 32 insertions, 0 deletions

diff --git a/tests/ui/issues/issue-49851/compiler-builtins-error.rs b/tests/ui/issues/issue-49851/compiler-builtins-error.rs
new file mode 100644
index 000000000..4e56cca33
--- /dev/null
+++ b/tests/ui/issues/issue-49851/compiler-builtins-error.rs
@@ -0,0 +1,13 @@
+//~ ERROR can't find crate for `core`
+//~^ ERROR can't find crate for `compiler_builtins`
+
+// compile-flags: --target thumbv7em-none-eabihf
+// needs-llvm-components: arm
+#![deny(unsafe_code)]
+#![deny(warnings)]
+#![no_std]
+
+extern crate cortex_m;
+//~^ ERROR can't find crate for `cortex_m`
+
+fn main() {}
diff --git a/tests/ui/issues/issue-49851/compiler-builtins-error.stderr b/tests/ui/issues/issue-49851/compiler-builtins-error.stderr
new file mode 100644
index 000000000..fcfa2bf11
--- /dev/null
+++ b/tests/ui/issues/issue-49851/compiler-builtins-error.stderr
@@ -0,0 +1,19 @@
+error[E0463]: can't find crate for `core`
+   |
+   = note: the `thumbv7em-none-eabihf` target may not be installed
+   = help: consider downloading the target with `rustup target add thumbv7em-none-eabihf`
+   = help: consider building the standard library from source with `cargo build -Zbuild-std`
+
+error[E0463]: can't find crate for `compiler_builtins`
+
+error[E0463]: can't find crate for `cortex_m`
+  --> $DIR/compiler-builtins-error.rs:10:1
+   |
+LL | extern crate cortex_m;
+   | ^^^^^^^^^^^^^^^^^^^^^^ can't find crate
+
+error: requires `sized` lang_item
+
+error: aborting due to 4 previous errors
+
+For more information about this error, try `rustc --explain E0463`.