Skip to content

Commit b602cf5

Browse files
committed
better error handling for rust.codegen-backends on deserialization
Signed-off-by: ozkanonur <[email protected]>
1 parent dfc9d3f commit b602cf5

File tree

2 files changed

+17
-3
lines changed

2 files changed

+17
-3
lines changed

src/bootstrap/compile.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1109,7 +1109,7 @@ fn needs_codegen_config(run: &RunConfig<'_>) -> bool {
11091109
needs_codegen_cfg
11101110
}
11111111

1112-
const CODEGEN_BACKEND_PREFIX: &str = "rustc_codegen_";
1112+
pub(crate) const CODEGEN_BACKEND_PREFIX: &str = "rustc_codegen_";
11131113

11141114
fn is_codegen_cfg_needed(path: &TaskPath, run: &RunConfig<'_>) -> bool {
11151115
if path.path.to_str().unwrap().contains(&CODEGEN_BACKEND_PREFIX) {

src/bootstrap/config.rs

+16-2
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ use std::str::FromStr;
2020
use crate::cache::{Interned, INTERNER};
2121
use crate::cc_detect::{ndk_compiler, Language};
2222
use crate::channel::{self, GitInfo};
23+
use crate::compile::CODEGEN_BACKEND_PREFIX;
2324
pub use crate::flags::Subcommand;
2425
use crate::flags::{Color, Flags, Warnings};
2526
use crate::util::{exe, output, t};
@@ -1452,8 +1453,21 @@ impl Config {
14521453
.map(|v| v.parse().expect("failed to parse rust.llvm-libunwind"));
14531454

14541455
if let Some(ref backends) = rust.codegen_backends {
1455-
config.rust_codegen_backends =
1456-
backends.iter().map(|s| INTERNER.intern_str(s)).collect();
1456+
let available_backends = vec!["llvm", "cranelift", "gcc"];
1457+
1458+
config.rust_codegen_backends = backends.iter().map(|s| {
1459+
if let Some(backend) = s.strip_prefix(CODEGEN_BACKEND_PREFIX) {
1460+
if available_backends.contains(&backend) {
1461+
panic!("Invalid value '{s}' for 'rust.codegen-backends'. Instead, please use '{backend}'.");
1462+
} else {
1463+
println!("help: '{s}' for 'rust.codegen-backends' might fail. \
1464+
Codegen backends are mostly defined without the '{CODEGEN_BACKEND_PREFIX}' prefix. \
1465+
In this case, it would be referred to as '{backend}'.");
1466+
}
1467+
}
1468+
1469+
INTERNER.intern_str(s)
1470+
}).collect();
14571471
}
14581472

14591473
config.rust_codegen_units = rust.codegen_units.map(threads_from_config);

0 commit comments

Comments
 (0)