Clean up the wasm-builder and release 1.0.8 (#3858)

This commit is contained in:
Bastian Köcher
2019-10-20 13:02:21 +02:00
committed by GitHub
parent f5162edc83
commit 222ff6fe79
8 changed files with 23 additions and 24 deletions
+13 -10
View File
@@ -205,9 +205,7 @@ impl CargoCommand {
}
fn args(&mut self, args: &[&str]) -> &mut Self {
for arg in args {
self.arg(arg);
}
args.into_iter().for_each(|a| { self.arg(a); });
self
}
@@ -227,12 +225,17 @@ impl CargoCommand {
/// Check if the supplied cargo command is a nightly version
fn is_nightly(&self) -> bool {
self.command()
.arg("--version")
.output()
.map_err(|_| ())
.and_then(|o| String::from_utf8(o.stdout).map_err(|_| ()))
.unwrap_or_default()
.contains("-nightly")
// `RUSTC_BOOTSTRAP` tells a stable compiler to behave like a nightly. So, when this env
// variable is set, we can assume that whatever rust compiler we have, it is a nightly compiler.
// For "more" information, see:
// https://github.com/rust-lang/rust/blob/fa0f7d0080d8e7e9eb20aa9cbf8013f96c81287f/src/libsyntax/feature_gate/check.rs#L891
env::var("RUSTC_BOOTSTRAP").is_ok() ||
self.command()
.arg("--version")
.output()
.map_err(|_| ())
.and_then(|o| String::from_utf8(o.stdout).map_err(|_| ()))
.unwrap_or_default()
.contains("-nightly")
}
}