Testing Configurations.md snippets without temp files

Author: davidalber

Cargo.lock

@@ -45,9 +45,6 @@ getopts = "0.2"
 derive-new = "0.5"
 cargo_metadata = "0.4"
 
-[dev-dependencies]
-tempfile = "2.2.0"
-
 [target.'cfg(unix)'.dependencies]
 libc = "0.2.11"
 

Cargo.toml

@@ -14,7 +14,6 @@
 extern crate log;
 extern crate regex;
 extern crate rustfmt_nightly as rustfmt;
-extern crate tempfile;
 extern crate term;
 
 use std::collections::HashMap;
@@ -24,8 +23,6 @@ use std::iter::Peekable;
 use std::path::{Path, PathBuf};
 use std::str::Chars;
 
-use tempfile::NamedTempFileOptions;
-
 use rustfmt::*;
 use rustfmt::config::{Color, Config, ReportTactic};
 use rustfmt::filemap::{write_system_newlines, FileMap};
@@ -529,8 +526,8 @@ fn get_code_blocks() -> Vec<CodeBlock> {
 
     let config_name_regex =
         regex::Regex::new(r"^## `([^`]+)`").expect("Failed creating configuration pattern");
-    let config_value_regex =
-        regex::Regex::new(r"^#### `([^`]+)`").expect("Failed creating configuration value pattern");
+    let config_value_regex = regex::Regex::new(r#"^#### `"?([^`"]+)"?`"#)
+        .expect("Failed creating configuration value pattern");
 
     let mut code_blocks = Vec::new();
     let mut extracting_block = false;
@@ -593,34 +590,33 @@ fn check_blocks_idempotency(blocks: &Vec<CodeBlock>) {
     let mut failures = 0;
 
     for block in blocks {
-        let mut temp_file = NamedTempFileOptions::new().suffix(".rs").create().unwrap();
-        let mut file_name_list = Vec::new();
-
-        // Write the configuration name and value at the top of the temp file.
-        writeln!(
-            temp_file,
-            "// {}: {}",
-            block.config.name, block.config.value
-        ).unwrap();
-
-        // Write the code block to the temp file.
-        write!(temp_file, "{}", block.code_block).unwrap();
-
-        // Format the temp file.
-        file_name_list.push(temp_file.path().to_path_buf());
-        let files = file_name_list.iter().map(|x| x.to_owned());
-        let (_reports, _count, fails) = check_files(files);
-
-        if fails != 0 {
-            // If formatting failed, print a message with the *actual* line
-            // number of the code block in Configurations.md. The message
-            // printed by `check_files` will use the name and line number from
-            // the temp file.
-            write_message(format!(
+        let input = Input::Text(block.code_block.clone());
+        let mut config = Config::default();
+        config.override_value(&block.config.name, &block.config.value);
+
+        let (error_summary, file_map, _report) =
+            format_input::<io::Stdout>(input, &config, None).unwrap();
+
+        if error_summary.has_parsing_errors() {
+            write_message(String::from(format!(
                 "\u{261d}\u{1f3fd} Failed to format block starting at Line {} in Configurations.md",
                 block.code_block_start_line
-            ));
-            failures += fails;
+            )));
+            failures += 1;
+        } else {
+            for &(ref file_name, ref text) in &file_map {
+                if let FileName::Custom(ref file_name) = *file_name {
+                    if file_name == "stdin" {
+                        let compare = make_diff(&block.code_block, text, DIFF_CONTEXT_SIZE);
+                        if !compare.is_empty() {
+                            let mut mismatches = HashMap::new();
+                            mismatches.insert(PathBuf::from("Configurations.md"), compare);
+                            print_mismatches(mismatches);
+                            failures += 1;
+                        }
+                    }
+                }
+            }
         }
     }