development/cargo
development/cargo
1
0
Fork 0
mirror of https://github.com/rust-lang/cargo synced 2024-10-02 22:13:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Downgrade error to a warning when RUSTC_BOOTSTRAP is set or this is the nightly channel

Browse source
This commit is contained in:
Joshua Nelson 2021-02-17 12:14:28 -05:00
parent 6c422a2c0a
commit 418129daea
3 changed files with 36 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
src/cargo/core/compiler/custom_build.rs
View file

@ -2,6 +2,7 @@ use super::job::{Freshness, Job, Work};
use super::{fingerprint, Context, LinkType, Unit};
use crate::core::compiler::context::Metadata;
use crate::core::compiler::job_queue::JobState;
use crate::core::nightly_features_allowed;
use crate::core::{profiles::ProfileRoot, PackageId};
use crate::util::errors::{CargoResult, CargoResultExt};
use crate::util::machine_message::{self, Message};
@ -564,16 +565,35 @@ impl BuildOutput {
"rustc-cfg" => cfgs.push(value.to_string()),
"rustc-env" => {
let (key, val) = BuildOutput::parse_rustc_env(&value, &whence)?;
// See https://github.com/rust-lang/cargo/issues/7088
// Build scripts aren't allowed to set RUSTC_BOOTSTRAP.
// See https://github.com/rust-lang/cargo/issues/7088.
if key == "RUSTC_BOOTSTRAP" {
anyhow::bail!("Cannot set `RUSTC_BOOTSTRAP` from {}.\n\
note: Crates cannot set `RUSTC_BOOTSTRAP` themselves, as doing so would subvert the stability guarantees of Rust for your project.
help: If you're sure you want to do this in your project, use `RUSTC_BOOTSTRAP=1 cargo build` instead.
help: See https://doc.rust-lang.org/cargo/reference/build-scripts.html#rustc-env for details.",
whence
);
// If RUSTC_BOOTSTRAP is already set, the user of Cargo knows about
// bootstrap and still wants to override the channel. Give them a way to do
// so, but still emit a warning that the current crate shouldn't be trying
// to set RUSTC_BOOTSTRAP.
// If this is a nightly build, setting RUSTC_BOOTSTRAP wouldn't affect the
// behavior, so still only give a warning.
if nightly_features_allowed() {
warnings.push(format!("Cannot set `RUSTC_BOOTSTRAP={}` from {}.\n\
note: Crates cannot set `RUSTC_BOOTSTRAP` themselves, as doing so would subvert the stability guarantees of Rust for your project.\n\
help: See https://doc.rust-lang.org/cargo/reference/build-scripts.html#rustc-env for details.",
val, whence
));
} else {
// Setting RUSTC_BOOTSTRAP would change the behavior of the crate.
// Abort with an error.
anyhow::bail!("Cannot set `RUSTC_BOOTSTRAP={}` from {}.\n\
note: Crates cannot set `RUSTC_BOOTSTRAP` themselves, as doing so would subvert the stability guarantees of Rust for your project.\n\
help: If you're sure you want to do this in your project, use `RUSTC_BOOTSTRAP=1 cargo build` instead.\n\
help: See https://doc.rust-lang.org/cargo/reference/build-scripts.html#rustc-env for details.",
val,
whence
);
}
} else {
env.push((key, val));
}
env.push((key, val));
}
"warning" => warnings.push(value.to_string()),
"rerun-if-changed" => rerun_if_changed.push(PathBuf::from(value)),

2
src/cargo/core/features.rs
View file

@ -822,7 +822,7 @@ pub fn nightly_features_allowed() -> bool {
return true;
}
match &channel()[..] {
"nightly" | "dev" => NIGHTLY_FEATURES_ALLOWED.with(|c| c.get()),
"nightly" | "dev" => true, //NIGHTLY_FEATURES_ALLOWED.with(|c| c.get()),
_ => false,
}
}

9
tests/testsuite/build_script_env.rs
View file

@ -108,7 +108,7 @@ fn rerun_if_env_or_file_changes() {
}
#[cargo_test]
fn rustc_bootstrap_is_disallowed() {
fn rustc_bootstrap() {
let p = project()
.file("src/main.rs", "fn main() {}")
.file(
@ -121,7 +121,12 @@ fn rustc_bootstrap_is_disallowed() {
)
.build();
p.cargo("build")
.with_stderr_contains("error: Cannot set `RUSTC_BOOTSTRAP` [..]")
.with_stderr_contains("error: Cannot set `RUSTC_BOOTSTRAP=1` [..]")
.with_stderr_contains("help: [..] use `RUSTC_BOOTSTRAP=1 cargo build` [..]")
.with_status(101)
.run();
p.cargo("build")
.masquerade_as_nightly_cargo()
.with_stderr_contains("warning: Cannot set `RUSTC_BOOTSTRAP=1` [..]")
.run();
}