diff options
| author | Alex Crichton <alex@alexcrichton.com> | 2018-07-25 17:25:12 -0700 |
|---|---|---|
| committer | Alex Crichton <alex@alexcrichton.com> | 2018-07-28 09:50:34 -0700 |
| commit | fa5b3d31fab43d904a7dc6bfe7db5f0e5fb81c43 (patch) | |
| tree | 2a5c761e07ed0ca9a05b809de53d6cc5817ec17b /src/tools | |
| parent | 26e73dabeb7a15e0e38feb2cadca3c1f740a61d2 (diff) | |
| download | rust-fa5b3d31fab43d904a7dc6bfe7db5f0e5fb81c43.tar.gz rust-fa5b3d31fab43d904a7dc6bfe7db5f0e5fb81c43.zip | |
Update the Cargo submodule and rustfix
Should hopefully bring in a few more `cargo fix`-related fixes.
Diffstat (limited to 'src/tools')
| m--------- | src/tools/cargo | 0 | ||||
| -rw-r--r-- | src/tools/compiletest/Cargo.toml | 2 | ||||
| -rw-r--r-- | src/tools/compiletest/src/runtest.rs | 8 | ||||
| -rw-r--r-- | src/tools/tidy/src/deps.rs | 1 |
4 files changed, 8 insertions, 3 deletions
diff --git a/src/tools/cargo b/src/tools/cargo -Subproject 506eea76edbf7198258265ddabcf320365bc4c5 +Subproject 2cd36b4ed1aef1ae39a30783e006411d1a4218a diff --git a/src/tools/compiletest/Cargo.toml b/src/tools/compiletest/Cargo.toml index 582ba5adfe5..6639ba51b12 100644 --- a/src/tools/compiletest/Cargo.toml +++ b/src/tools/compiletest/Cargo.toml @@ -13,7 +13,7 @@ regex = "0.2" serde = "1.0" serde_json = "1.0" serde_derive = "1.0" -rustfix = "0.3.1" +rustfix = "0.4.1" [target.'cfg(unix)'.dependencies] libc = "0.2" diff --git a/src/tools/compiletest/src/runtest.rs b/src/tools/compiletest/src/runtest.rs index ad86844cec3..ce7828144cd 100644 --- a/src/tools/compiletest/src/runtest.rs +++ b/src/tools/compiletest/src/runtest.rs @@ -21,7 +21,7 @@ use filetime::FileTime; use header::TestProps; use json; use regex::Regex; -use rustfix::{apply_suggestions, get_suggestions_from_json}; +use rustfix::{apply_suggestions, get_suggestions_from_json, Filter}; use util::{logv, PathBufExt}; use std::collections::hash_map::DefaultHasher; @@ -2621,7 +2621,11 @@ impl<'test> TestCx<'test> { let unfixed_code = self .load_expected_output_from_path(&self.testpaths.file) .unwrap(); - let suggestions = get_suggestions_from_json(&proc_res.stderr, &HashSet::new()).unwrap(); + let suggestions = get_suggestions_from_json( + &proc_res.stderr, + &HashSet::new(), + Filter::Everything, + ).unwrap(); let fixed_code = apply_suggestions(&unfixed_code, &suggestions).expect(&format!( "failed to apply suggestions for {:?} with rustfix", self.testpaths.file diff --git a/src/tools/tidy/src/deps.rs b/src/tools/tidy/src/deps.rs index 5105fc4ca4c..1a2e0f7fb24 100644 --- a/src/tools/tidy/src/deps.rs +++ b/src/tools/tidy/src/deps.rs @@ -26,6 +26,7 @@ static LICENSES: &'static [&'static str] = &[ "MIT OR Apache-2.0", "MIT", "Unlicense/MIT", + "Unlicense OR MIT", ]; /// These are exceptions to Rust's permissive licensing policy, and |