From: Nathanael Jones Date: Tue, 7 Feb 2017 00:22:36 +0000 (-0700) Subject: Make fresh_builds_possible_with_multiple_metadata_overrides faster X-Git-Tag: archive/raspbian/0.35.0-2+rpi1~3^2^2^2^2^2^2^2~22^2~9^2~163^2~4 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=b929cd31ed85e75f97d9cc806de13076222acdc9;p=cargo.git Make fresh_builds_possible_with_multiple_metadata_overrides faster --- diff --git a/src/cargo/ops/cargo_rustc/custom_build.rs b/src/cargo/ops/cargo_rustc/custom_build.rs index 431559868..e187ab800 100644 --- a/src/cargo/ops/cargo_rustc/custom_build.rs +++ b/src/cargo/ops/cargo_rustc/custom_build.rs @@ -408,7 +408,7 @@ impl BuildOutput { } /// Sort the contents of the struct for consistent hashing. - /// Suggested if populated from a HashMap instead of a order-preserving data source + /// Suggested if populated from a HashMap instead of an order-preserving data source pub fn sort(&mut self){ self.library_paths.sort(); self.library_links.sort(); diff --git a/tests/build-script.rs b/tests/build-script.rs index 822063bf1..660ce1e71 100644 --- a/tests/build-script.rs +++ b/tests/build-script.rs @@ -1812,8 +1812,6 @@ fn fresh_builds_possible_with_multiple_metadata_overrides() { [FINISHED] dev [unoptimized + debuginfo] target(s) in [..] ")); - sleep_ms(2000); - assert_that(p.cargo("build").arg("-v").env("RUST_LOG", "cargo::ops::cargo_rustc::fingerprint=info"), execs().with_status(0).with_stderr("\ [FRESH] foo v0.5.0 ([..])