rust-lang/rust
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Suggest x build library for a custom toolchain that fails to load core

Browse Source
This commit is contained in:
Mu001999
2023-07-02 17:53:44 +08:00
parent be6e38c617
commit b913f5593d
2 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
compiler/rustc_metadata/messages.ftl
View File

@@ -25,6 +25,9 @@ metadata_conflicting_alloc_error_handler =
metadata_conflicting_global_alloc = metadata_conflicting_global_alloc =
the `#[global_allocator]` in {$other_crate_name} conflicts with global allocator in: {$crate_name} the `#[global_allocator]` in {$other_crate_name} conflicts with global allocator in: {$crate_name}
metadata_consider_adding_std =
consider adding the standard library to the sysroot with `x build library --target {$locator_triple}`
metadata_consider_building_std = metadata_consider_building_std =
consider building the standard library from source with `cargo build -Zbuild-std` consider building the standard library from source with `cargo build -Zbuild-std`

14
compiler/rustc_metadata/src/errors.rs
View File

@@ -646,12 +646,18 @@ impl IntoDiagnostic<'_> for CannotFindCrate {
} else { } else {
diag.note(fluent::metadata_target_no_std_support); diag.note(fluent::metadata_target_no_std_support);
} }
// NOTE: this suggests using rustup, even though the user may not have it installed.
// That's because they could choose to install it; or this may give them a hint which
// target they need to install from their distro.
if self.missing_core { if self.missing_core {
diag.help(fluent::metadata_consider_downloading_target); if env!("CFG_RELEASE_CHANNEL") == "dev" {
diag.help(fluent::metadata_consider_adding_std);
} else {
// NOTE: this suggests using rustup, even though the user may not have it installed.
// That's because they could choose to install it; or this may give them a hint which
// target they need to install from their distro.
diag.help(fluent::metadata_consider_downloading_target);
}
} }
// Suggest using #![no_std]. #[no_core] is unstable and not really supported anyway. // Suggest using #![no_std]. #[no_core] is unstable and not really supported anyway.
// NOTE: this is a dummy span if `extern crate std` was injected by the compiler. // NOTE: this is a dummy span if `extern crate std` was injected by the compiler.
// If it's not a dummy, that means someone added `extern crate std` explicitly and // If it's not a dummy, that means someone added `extern crate std` explicitly and