Merge pull request #63 from rust-lang-nursery/apply_suggestion

Apply suggestion

Author: killercup

.travis.yml

@@ -2,8 +2,6 @@ language: rust
 rust:
 - nightly
 - stable
-before_script:
-- if [ $TRAVIS_RUST_VERSION == nightly ]; then cargo install clippy --git https://github.com/rust-lang-nursery/rust-clippy.git --force; fi
 script:
 - cargo build
 - if [ $TRAVIS_RUST_VERSION == nightly ]; then cargo test -- --nocapture ; fi

src/lib.rs

@@ -3,6 +3,7 @@ extern crate serde_derive;
 extern crate serde_json;
 
 use std::collections::HashSet;
+use std::error::Error;
 
 pub mod diagnostics;
 use diagnostics::{Diagnostic, DiagnosticSpan};
@@ -165,3 +166,59 @@ pub fn collect_suggestions<S: ::std::hash::BuildHasher>(diagnostic: &Diagnostic,
         })
     }
 }
+
+pub fn apply_suggestion(file_content: &mut String, suggestion: &Replacement) -> String {
+    use std::cmp::max;
+
+    let mut new_content = String::new();
+
+    // Add the lines before the section we want to replace
+    new_content.push_str(&file_content.lines()
+        .take(max(suggestion.snippet.line_range.start.line - 1, 0) as usize)
+        .collect::<Vec<_>>()
+        .join("\n"));
+    new_content.push_str("\n");
+
+    // Parts of line before replacement
+    new_content.push_str(&file_content.lines()
+        .nth(suggestion.snippet.line_range.start.line - 1)
+        .unwrap_or("")
+        .chars()
+        .take(suggestion.snippet.line_range.start.column - 1)
+        .collect::<String>());
+
+    // Insert new content! Finally!
+    new_content.push_str(&suggestion.replacement);
+
+    // Parts of line after replacement
+    new_content.push_str(&file_content.lines()
+        .nth(suggestion.snippet.line_range.end.line - 1)
+        .unwrap_or("")
+        .chars()
+        .skip(suggestion.snippet.line_range.end.column - 1)
+        .collect::<String>());
+
+    // Add the lines after the section we want to replace
+    new_content.push_str("\n");
+    new_content.push_str(&file_content.lines()
+        .skip(suggestion.snippet.line_range.end.line as usize)
+        .collect::<Vec<_>>()
+        .join("\n"));
+    new_content.push_str("\n");
+
+    new_content
+}
+
+pub fn apply_suggestions(code: &str, suggestions: &[Suggestion]) -> String {
+    let mut fixed = code.to_string();
+
+    for sug in suggestions.iter().rev() {
+        for sol in &sug.solutions {
+            for r in &sol.replacements {
+                fixed = apply_suggestion(&mut fixed, r);
+            }
+        }
+    }
+
+    fixed
+}

src/main.rs

@@ -398,44 +398,8 @@ fn indent(size: u32, s: &str) -> String {
 /// This function is as stupid as possible. Make sure you call for the replacemnts in one file in
 /// reverse order to not mess up the lines for replacements further down the road.
 fn apply_suggestion(suggestion: &Replacement) -> Result<(), ProgramError> {
-    use std::cmp::max;
-
-    let file_content = try!(read_file_to_string(&suggestion.snippet.file_name));
-    let mut new_content = String::new();
-
-    // Add the lines before the section we want to replace
-    new_content.push_str(&file_content.lines()
-        .take(max(suggestion.snippet.line_range.start.line - 1, 0) as usize)
-        .collect::<Vec<_>>()
-        .join("\n"));
-    new_content.push_str("\n");
-
-    // Parts of line before replacement
-    new_content.push_str(&file_content.lines()
-        .nth(suggestion.snippet.line_range.start.line - 1)
-        .unwrap_or("")
-        .chars()
-        .take(suggestion.snippet.line_range.start.column - 1)
-        .collect::<String>());
-
-    // Insert new content! Finally!
-    new_content.push_str(&suggestion.replacement);
-
-    // Parts of line after replacement
-    new_content.push_str(&file_content.lines()
-        .nth(suggestion.snippet.line_range.end.line - 1)
-        .unwrap_or("")
-        .chars()
-        .skip(suggestion.snippet.line_range.end.column - 1)
-        .collect::<String>());
-
-    // Add the lines after the section we want to replace
-    new_content.push_str("\n");
-    new_content.push_str(&file_content.lines()
-        .skip(suggestion.snippet.line_range.end.line as usize)
-        .collect::<Vec<_>>()
-        .join("\n"));
-    new_content.push_str("\n");
+    let mut file_content = try!(read_file_to_string(&suggestion.snippet.file_name));
+    let new_content = rustfix::apply_suggestion(&mut file_content, suggestion);
 
     let mut file = try!(File::create(&suggestion.snippet.file_name));
     let new_content = new_content.as_bytes();

tests/everything.rs

@@ -13,12 +13,12 @@ use std::collections::HashSet;
 use std::process::Output;
 use tempdir::TempDir;
 
-use rustfix::Replacement;
+use rustfix::{Replacement, apply_suggestions};
 
 fn compile(file: &Path) -> Result<Output, Box<Error>> {
     let tmp = TempDir::new("rustfix-tests")?;
     let better_call_clippy = cmd!(
-        "clippy-driver", "rustc", file,
+        "rustc", file,
         "--error-format=pretty-json", "-Zunstable-options", "--emit=metadata",
         "--crate-name=rustfix_test",
         "--out-dir", tmp.path()
@@ -75,48 +75,6 @@ fn read_file(path: &Path) -> Result<String, Box<Error>> {
     Ok(buffer)
 }
 
-fn apply_suggestion(file_content: &mut String, suggestion: &Replacement) -> Result<String, Box<Error>> {
-    use std::cmp::max;
-
-    let mut new_content = String::new();
-
-    // Add the lines before the section we want to replace
-    new_content.push_str(&file_content.lines()
-        .take(max(suggestion.snippet.line_range.start.line - 1, 0) as usize)
-        .collect::<Vec<_>>()
-        .join("\n"));
-    new_content.push_str("\n");
-
-    // Parts of line before replacement
-    new_content.push_str(&file_content.lines()
-        .nth(suggestion.snippet.line_range.start.line - 1)
-        .unwrap_or("")
-        .chars()
-        .take(suggestion.snippet.line_range.start.column - 1)
-        .collect::<String>());
-
-    // Insert new content! Finally!
-    new_content.push_str(&suggestion.replacement);
-
-    // Parts of line after replacement
-    new_content.push_str(&file_content.lines()
-        .nth(suggestion.snippet.line_range.end.line - 1)
-        .unwrap_or("")
-        .chars()
-        .skip(suggestion.snippet.line_range.end.column - 1)
-        .collect::<String>());
-
-    // Add the lines after the section we want to replace
-    new_content.push_str("\n");
-    new_content.push_str(&file_content.lines()
-        .skip(suggestion.snippet.line_range.end.line as usize)
-        .collect::<Vec<_>>()
-        .join("\n"));
-    new_content.push_str("\n");
-
-    Ok(new_content)
-}
-
 fn test_rustfix_with_file<P: AsRef<Path>>(file: P) -> Result<(), Box<Error>> {
     let file: &Path = file.as_ref();
     let json_file = file.with_extension("json");
@@ -141,19 +99,7 @@ fn test_rustfix_with_file<P: AsRef<Path>>(file: P) -> Result<(), Box<Error>> {
         "got unexpected suggestions from clippy",
     );
 
-    let mut fixed = code.clone();
-
-    for sug in suggestions.into_iter().rev() {
-        trace!("{:?}", sug);
-        for sol in sug.solutions {
-            trace!("{:?}", sol);
-            for r in sol.replacements {
-                debug!("replaced.");
-                trace!("{:?}", r);
-                fixed = apply_suggestion(&mut fixed, &r)?;
-            }
-        }
-    }
+    let fixed = apply_suggestions(&code, &suggestions);
 
     if std::env::var("RUSTFIX_TEST_RECORD_FIXED_RUST").is_ok() {
         use std::io::Write;