mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Prepare bootstrap tool for new check-cfg syntax

Browse Source
This commit is contained in:
Urgau 2023-10-20 17:47:22 +02:00
parent 8501f1c7ba
commit 276a34666b
2 changed files with 28 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/bootstrap/src/bin/rustdoc.rs
View File

@ -70,7 +70,9 @@ fn main() {
cmd.arg("--cfg=bootstrap");
}
cmd.arg("-Zunstable-options");
// #[cfg(bootstrap)]
cmd.arg("--check-cfg=values(bootstrap)");
// cmd.arg("--check-cfg=cfg(bootstrap)");
if verbose > 1 {
eprintln!(

34
src/bootstrap/src/core/builder.rs
View File

@ -1401,19 +1401,28 @@ pub fn cargo(
rustflags.arg("-Zunstable-options");
}
// Enable cfg checking of cargo features for everything but std and also enable cfg
// checking of names and values.
// #[cfg(bootstrap)] should remove every code path where it's false
const USE_NEW_CHECK_CFG_SYNTAX: bool = false;
// Enable compile-time checking of `cfg` names, values and Cargo `features`.
//
// Note: `std`, `alloc` and `core` imports some dependencies by #[path] (like
// backtrace, core_simd, std_float, ...), those dependencies have their own
// features but cargo isn't involved in the #[path] process and so cannot pass the
// complete list of features, so for that reason we don't enable checking of
// features for std crates.
cargo.arg(if mode != Mode::Std {
"-Zcheck-cfg=names,values,output,features"
if USE_NEW_CHECK_CFG_SYNTAX {
cargo.arg("-Zcheck-cfg");
if mode == Mode::Std {
rustflags.arg("--check-cfg=cfg(feature,values(any()))");
}
} else {
"-Zcheck-cfg=names,values,output"
});
cargo.arg(if mode != Mode::Std {
"-Zcheck-cfg=names,values,output,features"
} else {
"-Zcheck-cfg=names,values,output"
});
}
// Add extra cfg not defined in/by rustc
//
@ -1433,7 +1442,12 @@ pub fn cargo(
.collect::<String>(),
None => String::new(),
};
rustflags.arg(&format!("--check-cfg=values({name}{values})"));
if USE_NEW_CHECK_CFG_SYNTAX {
let values = values.strip_prefix(",").unwrap_or(&values); // remove the first `,`
rustflags.arg(&format!("--check-cfg=cfg({name},values({values}))"));
} else {
rustflags.arg(&format!("--check-cfg=values({name}{values})"));
}
}
}
@ -1449,7 +1463,11 @@ pub fn cargo(
// We also declare that the flag is expected, which we need to do to not
// get warnings about it being unexpected.
hostflags.arg("-Zunstable-options");
hostflags.arg("--check-cfg=values(bootstrap)");
if USE_NEW_CHECK_CFG_SYNTAX {
hostflags.arg("--check-cfg=cfg(bootstrap)");
} else {
hostflags.arg("--check-cfg=values(bootstrap)");
}
// FIXME: It might be better to use the same value for both `RUSTFLAGS` and `RUSTDOCFLAGS`,
// but this breaks CI. At the very least, stage0 `rustdoc` needs `--cfg bootstrap`. See