Skip to content
Permalink
Browse files

Stylistic changes

  • Loading branch information...
alexcrichton committed Sep 10, 2019
1 parent 1607871 commit 9b34ef643f82f14b7c94041af4b34788801c9983
Showing with 7 additions and 13 deletions.
  1. +7 −13 src/bootstrap/builder.rs
@@ -1079,12 +1079,9 @@ impl<'a> Builder<'a> {
}
}

match mode {
Mode::Rustc | Mode::Codegen => {
rustflags.arg("-Zunstable-options");
rustflags.arg("-Wrustc::internal");
}
_ => {}
if let Mode::Rustc | Mode::Codegen = mode {
rustflags.arg("-Zunstable-options");
rustflags.arg("-Wrustc::internal");
}

// Throughout the build Cargo can execute a number of build scripts
@@ -1230,11 +1227,8 @@ impl<'a> Builder<'a> {
// When we build Rust dylibs they're all intended for intermediate
// usage, so make sure we pass the -Cprefer-dynamic flag instead of
// linking all deps statically into the dylib.
match mode {
Mode::Std | Mode::Rustc | Mode::Codegen => {
rustflags.arg("-Cprefer-dynamic");
}
_ => {}
if let Mode::Std | Mode::Rustc | Mode::Codegen = mode {
rustflags.arg("-Cprefer-dynamic");
}

Cargo {
@@ -1348,7 +1342,7 @@ impl Rustflags {
fn new(target: &str, cmd: &mut Command) -> Rustflags {
let mut ret = Rustflags(String::new());

// Inherit `RUSTFLAGS` by default
// Inherit `RUSTFLAGS` by default ...
ret.env("RUSTFLAGS");

// ... and also handle target-specific env RUSTFLAGS if they're
@@ -1358,7 +1352,7 @@ impl Rustflags {
ret.env(&target_specific);
cmd.env_remove(&target_specific);

return ret;
ret
}

fn env(&mut self, env: &str) {

0 comments on commit 9b34ef6

Please sign in to comment.
You can’t perform that action at this time.