Merge #42

42: Add flag to only apply certain lints/errors' suggestions  r=killercup a=oli-obk

cc #36

Author: bors[bot]

src/diagnostics.rs

@@ -6,7 +6,7 @@
 pub struct Diagnostic {
     /// The primary error message.
     pub message: String,
-    code: Option<DiagnosticCode>,
+    pub code: Option<DiagnosticCode>,
     /// "error: internal compiler error", "error", "warning", "note", "help".
     level: String,
     pub spans: Vec<DiagnosticSpan>,
@@ -70,9 +70,9 @@ struct DiagnosticSpanMacroExpansion {
 }
 
 #[derive(Deserialize, Debug)]
-struct DiagnosticCode {
+pub struct DiagnosticCode {
     /// The code itself.
-    code: String,
+    pub code: String,
     /// An explanation for the code.
     explanation: Option<String>,
 }

src/lib.rs

@@ -2,6 +2,8 @@
 extern crate serde_derive;
 extern crate serde_json;
 
+use std::collections::HashSet;
+
 pub mod diagnostics;
 use diagnostics::{Diagnostic, DiagnosticSpan};
 
@@ -106,7 +108,18 @@ fn collect_span(span: &DiagnosticSpan) -> Option<Replacement> {
     })
 }
 
-pub fn collect_suggestions(diagnostic: &Diagnostic) -> Option<Suggestion> {
+pub fn collect_suggestions(diagnostic: &Diagnostic, only: &HashSet<String>) -> Option<Suggestion> {
+    if !only.is_empty() {
+        if let Some(ref code) = diagnostic.code {
+            if !only.contains(&code.code) {
+                // This is not the code we are looking for
+                return None;
+            }
+        } else {
+            // No code, probably a weird builtin warning/error
+            return None;
+        }
+    }
 
     let snippets = diagnostic.spans
         .iter()

src/main.rs

@@ -13,6 +13,7 @@ use std::fs::File;
 use std::io::{Read, Write};
 use std::error::Error;
 use std::process::Command;
+use std::collections::HashSet;
 
 use colored::Colorize;
 use clap::{Arg, App};
@@ -48,6 +49,11 @@ macro_rules! flush {
     () => (try!(std::io::stdout().flush());)
 }
 
+/// A list of `--only` aliases
+const ALIASES: &[(&str, &[&str])] = &[
+    ("use", &["E0412"]),
+];
+
 fn try_main() -> Result<(), ProgramError> {
     let matches = App::new("rustfix")
         .about("Automatically apply suggestions made by rustc")
@@ -58,6 +64,10 @@ fn try_main() -> Result<(), ProgramError> {
         .arg(Arg::with_name("yolo")
             .long("yolo")
             .help("Automatically apply all unambiguous suggestions"))
+        .arg(Arg::with_name("only")
+            .long("only")
+            .help("Only show errors or lints with the specific id(s) (comma separated)")
+            .use_delimiter(true))
         .get_matches();
 
     let mut extra_args = Vec::new();
@@ -72,6 +82,20 @@ fn try_main() -> Result<(), ProgramError> {
         AutofixMode::None
     };
 
+    let mut only: HashSet<String> = matches
+        .values_of("only")
+        .map_or(HashSet::new(), |values| {
+            values.map(ToString::to_string).collect()
+        });
+
+    for alias in ALIASES {
+        if only.remove(alias.0) {
+            for alias in alias.1 {
+                only.insert(alias.to_string());
+            }
+        }
+    }
+
     // Get JSON output from rustc...
     let json = get_json(&extra_args)?;
 
@@ -80,7 +104,7 @@ fn try_main() -> Result<(), ProgramError> {
         // Convert JSON string (and eat parsing errors)
         .flat_map(|line| serde_json::from_str::<CargoMessage>(line))
         // One diagnostic line might have multiple suggestions
-        .filter_map(|cargo_msg| rustfix::collect_suggestions(&cargo_msg.message))
+        .filter_map(|cargo_msg| rustfix::collect_suggestions(&cargo_msg.message, &only))
         .collect();
 
     try!(handle_suggestions(suggestions, mode));

tests/fixtures.rs

@@ -1,7 +1,8 @@
 #[macro_use]
 extern crate duct;
 
-use std::io::{BufReader, BufRead};
+use std::io::{BufReader, BufRead, Read};
+use std::fs::File;
 
 #[test]
 fn fixtures() {
@@ -32,7 +33,6 @@ fn fixtures() {
 
             for entry in tests {
                 let test = entry.unwrap().path();
-                let yolo = test.file_name().unwrap() == "yolo";
 
                 println!("Running test: {}", test.file_name().unwrap().to_str().unwrap());
 
@@ -47,11 +47,21 @@ fn fixtures() {
                 println!("Running cargo clippy to obtain suggestions");
 
                 let manifest = format!("--manifest-path={}", &manifest[1..manifest.len() - 1]);
-                let cmd = if yolo {
-                    cmd!("cargo", "run", manifest, "--bin", "rustfix", "--quiet", "--", "--clippy", "--yolo")
-                } else {
-                    cmd!("cargo", "run", manifest, "--bin", "rustfix", "--quiet", "--", "--clippy")
-                };
+                let mut args = vec![
+                    "run".to_owned(),
+                    manifest,
+                    "--bin".to_owned(),
+                    "rustfix".to_owned(),
+                    "--quiet".to_owned(),
+                    "--".to_owned(),
+                    "--clippy".to_owned(),
+                ];
+                if let Ok(mut file) = File::open(test.join("args.txt")) {
+                    let mut extra_args = String::new();
+                    file.read_to_string(&mut extra_args).unwrap();
+                    args.extend(extra_args.split_whitespace().map(|s| s.to_string()));
+                }
+                let cmd = duct::cmd("cargo", args);
                 cmd.dir(&dir)
                     .stdin(test.join("input.txt"))
                     .stdout(dir.join("output.txt"))

tests/tests/libui-rs/simple/args.txt

@@ -0,0 +1 @@
+--only transmute_ptr_to_ref,new_without_default

tests/tests/libui-rs/skipping/args.txt

@@ -0,0 +1 @@
+--only transmute_ptr_to_ref,new_without_default

tests/tests/libui-rs/yolo/args.txt

@@ -0,0 +1 @@
+--yolo --only transmute_ptr_to_ref,new_without_default