From b637d5284c6117da3bfeb471da7c62e53a632621 Mon Sep 17 00:00:00 2001 From: Daniel Mueller Date: Fri, 24 May 2019 18:08:42 -0700 Subject: Update cc crate to 1.0.37 This change updates the cc crate to version 1.0.37. Import subrepo cc/:cc at cbf6d2f1312b6be22a7a363cf5c2a02acabc531f --- cc/tests/cc_env.rs | 8 +++++--- cc/tests/support/mod.rs | 6 ++++-- cc/tests/test.rs | 8 ++------ 3 files changed, 11 insertions(+), 11 deletions(-) (limited to 'cc/tests') diff --git a/cc/tests/cc_env.rs b/cc/tests/cc_env.rs index f9386d7..e862fea 100644 --- a/cc/tests/cc_env.rs +++ b/cc/tests/cc_env.rs @@ -2,8 +2,8 @@ extern crate cc; extern crate tempdir; use std::env; -use std::path::Path; use std::ffi::OsString; +use std::path::Path; mod support; use support::Test; @@ -63,14 +63,16 @@ fn ccache_env_flags() { .cflags_env() .into_string() .unwrap() - .contains("ccache") == false + .contains("ccache") + == false ); assert!( compiler .cflags_env() .into_string() .unwrap() - .contains(" lol-this-is-not-a-compiler") == false + .contains(" lol-this-is-not-a-compiler") + == false ); env::set_var("CC", ""); diff --git a/cc/tests/support/mod.rs b/cc/tests/support/mod.rs index cae8151..72ca3fa 100644 --- a/cc/tests/support/mod.rs +++ b/cc/tests/support/mod.rs @@ -113,10 +113,12 @@ impl Execution { } pub fn must_have_in_order(&self, before: &str, after: &str) -> &Execution { - let before_position = self.args + let before_position = self + .args .iter() .rposition(|x| OsStr::new(x) == OsStr::new(before)); - let after_position = self.args + let after_position = self + .args .iter() .rposition(|x| OsStr::new(x) == OsStr::new(after)); match (before_position, after_position) { diff --git a/cc/tests/test.rs b/cc/tests/test.rs index 573a99a..5147b77 100644 --- a/cc/tests/test.rs +++ b/cc/tests/test.rs @@ -115,9 +115,7 @@ fn gnu_warnings_overridable() { fn gnu_no_warnings_if_cflags() { env::set_var("CFLAGS", "-Wflag-does-not-exist"); let test = Test::gnu(); - test.gcc() - .file("foo.c") - .compile("foo"); + test.gcc().file("foo.c").compile("foo"); test.cmd(0).must_not_have("-Wall").must_not_have("-Wextra"); env::set_var("CFLAGS", ""); @@ -127,9 +125,7 @@ fn gnu_no_warnings_if_cflags() { fn gnu_no_warnings_if_cxxflags() { env::set_var("CXXFLAGS", "-Wflag-does-not-exist"); let test = Test::gnu(); - test.gcc() - .file("foo.c") - .compile("foo"); + test.gcc().file("foo.c").compile("foo"); test.cmd(0).must_not_have("-Wall").must_not_have("-Wextra"); env::set_var("CXXFLAGS", ""); -- cgit v1.2.1