Merge remote-tracking branch 'upstream/master' into accept-manifest-path
This commit is contained in:
calebcartwright
commit
aef8e93514
@ -89,7 +89,14 @@ fn execute() -> i32 {
|
||||
};
|
||||
|
||||
if opts.version {
|
||||
return handle_command_status(get_version());
|
||||
return handle_command_status(get_rustfmt_info(&[String::from("--version")]));
|
||||
}
|
||||
if opts.rustfmt_options.iter().any(|s| {
|
||||
["--print-config", "-h", "--help", "-V", "--version"].contains(&s.as_str())
|
||||
|| s.starts_with("--help=")
|
||||
|| s.starts_with("--print-config=")
|
||||
}) {
|
||||
return handle_command_status(get_rustfmt_info(&opts.rustfmt_options));
|
||||
}
|
||||
|
||||
let strategy = CargoFmtStrategy::from_opts(&opts);
|
||||
@ -142,10 +149,10 @@ fn handle_command_status(status: Result<i32, io::Error>) -> i32 {
|
||||
}
|
||||
}
|
||||
|
||||
fn get_version() -> Result<i32, io::Error> {
|
||||
fn get_rustfmt_info(args: &[String]) -> Result<i32, io::Error> {
|
||||
let mut command = Command::new("rustfmt")
|
||||
.stdout(std::process::Stdio::inherit())
|
||||
.args(&[String::from("--version")])
|
||||
.args(args)
|
||||
.spawn()
|
||||
.map_err(|e| match e.kind() {
|
||||
io::ErrorKind::NotFound => io::Error::new(
|
||||
@ -168,14 +175,7 @@ fn format_crate(
|
||||
rustfmt_args: Vec<String>,
|
||||
manifest_path: Option<&Path>,
|
||||
) -> Result<i32, io::Error> {
|
||||
let targets = if rustfmt_args
|
||||
.iter()
|
||||
.any(|s| ["--print-config", "-h", "--help", "-V", "--version"].contains(&s.as_str()))
|
||||
{
|
||||
BTreeSet::new()
|
||||
} else {
|
||||
get_targets(strategy, manifest_path)?
|
||||
};
|
||||
let targets = get_targets(strategy, manifest_path)?;
|
||||
|
||||
// Currently only bin and lib files get formatted.
|
||||
run_rustfmt(&targets, &rustfmt_args, verbosity)
|
||||
|
||||
@ -612,7 +612,11 @@ pub(crate) fn extract_post_comment(
|
||||
post_snippet[1..].trim_matches(white_space)
|
||||
} else if post_snippet.starts_with(separator) {
|
||||
post_snippet[separator.len()..].trim_matches(white_space)
|
||||
} else if post_snippet.ends_with(',') && !post_snippet.trim().starts_with("//") {
|
||||
}
|
||||
// not comment or over two lines
|
||||
else if post_snippet.ends_with(',')
|
||||
&& (!post_snippet.trim().starts_with("//") || post_snippet.trim().contains('\n'))
|
||||
{
|
||||
post_snippet[..(post_snippet.len() - 1)].trim_matches(white_space)
|
||||
} else {
|
||||
post_snippet
|
||||
|
||||
286
src/test/configuration_snippet.rs
Normal file
286
src/test/configuration_snippet.rs
Normal file
@ -0,0 +1,286 @@
|
||||
use std::collections::{HashMap, HashSet};
|
||||
use std::fs;
|
||||
use std::io::{BufRead, BufReader, Write};
|
||||
use std::iter::Enumerate;
|
||||
use std::path::{Path, PathBuf};
|
||||
|
||||
use super::{print_mismatches, write_message, DIFF_CONTEXT_SIZE};
|
||||
use crate::config::{Config, EmitMode, Verbosity};
|
||||
use crate::rustfmt_diff::{make_diff, Mismatch};
|
||||
use crate::{Input, Session};
|
||||
|
||||
const CONFIGURATIONS_FILE_NAME: &str = "Configurations.md";
|
||||
|
||||
// This enum is used to represent one of three text features in Configurations.md: a block of code
|
||||
// with its starting line number, the name of a rustfmt configuration option, or the value of a
|
||||
// rustfmt configuration option.
|
||||
enum ConfigurationSection {
|
||||
CodeBlock((String, u32)), // (String: block of code, u32: line number of code block start)
|
||||
ConfigName(String),
|
||||
ConfigValue(String),
|
||||
}
|
||||
|
||||
impl ConfigurationSection {
|
||||
fn get_section<I: Iterator<Item = String>>(
|
||||
file: &mut Enumerate<I>,
|
||||
) -> Option<ConfigurationSection> {
|
||||
lazy_static! {
|
||||
static ref CONFIG_NAME_REGEX: regex::Regex =
|
||||
regex::Regex::new(r"^## `([^`]+)`").expect("failed creating configuration pattern");
|
||||
static ref CONFIG_VALUE_REGEX: regex::Regex =
|
||||
regex::Regex::new(r#"^#### `"?([^`"]+)"?`"#)
|
||||
.expect("failed creating configuration value pattern");
|
||||
}
|
||||
|
||||
loop {
|
||||
match file.next() {
|
||||
Some((i, line)) => {
|
||||
if line.starts_with("```rust") {
|
||||
// Get the lines of the code block.
|
||||
let lines: Vec<String> = file
|
||||
.map(|(_i, l)| l)
|
||||
.take_while(|l| !l.starts_with("```"))
|
||||
.collect();
|
||||
let block = format!("{}\n", lines.join("\n"));
|
||||
|
||||
// +1 to translate to one-based indexing
|
||||
// +1 to get to first line of code (line after "```")
|
||||
let start_line = (i + 2) as u32;
|
||||
|
||||
return Some(ConfigurationSection::CodeBlock((block, start_line)));
|
||||
} else if let Some(c) = CONFIG_NAME_REGEX.captures(&line) {
|
||||
return Some(ConfigurationSection::ConfigName(String::from(&c[1])));
|
||||
} else if let Some(c) = CONFIG_VALUE_REGEX.captures(&line) {
|
||||
return Some(ConfigurationSection::ConfigValue(String::from(&c[1])));
|
||||
}
|
||||
}
|
||||
None => return None, // reached the end of the file
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// This struct stores the information about code blocks in the configurations
|
||||
// file, formats the code blocks, and prints formatting errors.
|
||||
struct ConfigCodeBlock {
|
||||
config_name: Option<String>,
|
||||
config_value: Option<String>,
|
||||
code_block: Option<String>,
|
||||
code_block_start: Option<u32>,
|
||||
}
|
||||
|
||||
impl ConfigCodeBlock {
|
||||
fn new() -> ConfigCodeBlock {
|
||||
ConfigCodeBlock {
|
||||
config_name: None,
|
||||
config_value: None,
|
||||
code_block: None,
|
||||
code_block_start: None,
|
||||
}
|
||||
}
|
||||
|
||||
fn set_config_name(&mut self, name: Option<String>) {
|
||||
self.config_name = name;
|
||||
self.config_value = None;
|
||||
}
|
||||
|
||||
fn set_config_value(&mut self, value: Option<String>) {
|
||||
self.config_value = value;
|
||||
}
|
||||
|
||||
fn set_code_block(&mut self, code_block: String, code_block_start: u32) {
|
||||
self.code_block = Some(code_block);
|
||||
self.code_block_start = Some(code_block_start);
|
||||
}
|
||||
|
||||
fn get_block_config(&self) -> Config {
|
||||
let mut config = Config::default();
|
||||
config.set().verbose(Verbosity::Quiet);
|
||||
if self.config_name.is_some() && self.config_value.is_some() {
|
||||
config.override_value(
|
||||
self.config_name.as_ref().unwrap(),
|
||||
self.config_value.as_ref().unwrap(),
|
||||
);
|
||||
}
|
||||
config
|
||||
}
|
||||
|
||||
fn code_block_valid(&self) -> bool {
|
||||
// We never expect to not have a code block.
|
||||
assert!(self.code_block.is_some() && self.code_block_start.is_some());
|
||||
|
||||
// See if code block begins with #![rustfmt::skip].
|
||||
let fmt_skip = self
|
||||
.code_block
|
||||
.as_ref()
|
||||
.unwrap()
|
||||
.lines()
|
||||
.nth(0)
|
||||
.unwrap_or("")
|
||||
== "#![rustfmt::skip]";
|
||||
|
||||
if self.config_name.is_none() && !fmt_skip {
|
||||
write_message(&format!(
|
||||
"No configuration name for {}:{}",
|
||||
CONFIGURATIONS_FILE_NAME,
|
||||
self.code_block_start.unwrap()
|
||||
));
|
||||
return false;
|
||||
}
|
||||
if self.config_value.is_none() && !fmt_skip {
|
||||
write_message(&format!(
|
||||
"No configuration value for {}:{}",
|
||||
CONFIGURATIONS_FILE_NAME,
|
||||
self.code_block_start.unwrap()
|
||||
));
|
||||
return false;
|
||||
}
|
||||
true
|
||||
}
|
||||
|
||||
fn has_parsing_errors<T: Write>(&self, session: &Session<'_, T>) -> bool {
|
||||
if session.has_parsing_errors() {
|
||||
write_message(&format!(
|
||||
"\u{261d}\u{1f3fd} Cannot format {}:{}",
|
||||
CONFIGURATIONS_FILE_NAME,
|
||||
self.code_block_start.unwrap()
|
||||
));
|
||||
return true;
|
||||
}
|
||||
|
||||
false
|
||||
}
|
||||
|
||||
fn print_diff(&self, compare: Vec<Mismatch>) {
|
||||
let mut mismatches = HashMap::new();
|
||||
mismatches.insert(PathBuf::from(CONFIGURATIONS_FILE_NAME), compare);
|
||||
print_mismatches(mismatches, |line_num| {
|
||||
format!(
|
||||
"\nMismatch at {}:{}:",
|
||||
CONFIGURATIONS_FILE_NAME,
|
||||
line_num + self.code_block_start.unwrap() - 1
|
||||
)
|
||||
});
|
||||
}
|
||||
|
||||
fn formatted_has_diff(&self, text: &str) -> bool {
|
||||
let compare = make_diff(self.code_block.as_ref().unwrap(), text, DIFF_CONTEXT_SIZE);
|
||||
if !compare.is_empty() {
|
||||
self.print_diff(compare);
|
||||
return true;
|
||||
}
|
||||
|
||||
false
|
||||
}
|
||||
|
||||
// Return a bool indicating if formatting this code block is an idempotent
|
||||
// operation. This function also triggers printing any formatting failure
|
||||
// messages.
|
||||
fn formatted_is_idempotent(&self) -> bool {
|
||||
// Verify that we have all of the expected information.
|
||||
if !self.code_block_valid() {
|
||||
return false;
|
||||
}
|
||||
|
||||
let input = Input::Text(self.code_block.as_ref().unwrap().to_owned());
|
||||
let mut config = self.get_block_config();
|
||||
config.set().emit_mode(EmitMode::Stdout);
|
||||
let mut buf: Vec<u8> = vec![];
|
||||
|
||||
{
|
||||
let mut session = Session::new(config, Some(&mut buf));
|
||||
session.format(input).unwrap();
|
||||
if self.has_parsing_errors(&session) {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
!self.formatted_has_diff(&String::from_utf8(buf).unwrap())
|
||||
}
|
||||
|
||||
// Extract a code block from the iterator. Behavior:
|
||||
// - Rust code blocks are identifed by lines beginning with "```rust".
|
||||
// - One explicit configuration setting is supported per code block.
|
||||
// - Rust code blocks with no configuration setting are illegal and cause an
|
||||
// assertion failure, unless the snippet begins with #![rustfmt::skip].
|
||||
// - Configuration names in Configurations.md must be in the form of
|
||||
// "## `NAME`".
|
||||
// - Configuration values in Configurations.md must be in the form of
|
||||
// "#### `VALUE`".
|
||||
fn extract<I: Iterator<Item = String>>(
|
||||
file: &mut Enumerate<I>,
|
||||
prev: Option<&ConfigCodeBlock>,
|
||||
hash_set: &mut HashSet<String>,
|
||||
) -> Option<ConfigCodeBlock> {
|
||||
let mut code_block = ConfigCodeBlock::new();
|
||||
code_block.config_name = prev.and_then(|cb| cb.config_name.clone());
|
||||
|
||||
loop {
|
||||
match ConfigurationSection::get_section(file) {
|
||||
Some(ConfigurationSection::CodeBlock((block, start_line))) => {
|
||||
code_block.set_code_block(block, start_line);
|
||||
break;
|
||||
}
|
||||
Some(ConfigurationSection::ConfigName(name)) => {
|
||||
assert!(
|
||||
Config::is_valid_name(&name),
|
||||
"an unknown configuration option was found: {}",
|
||||
name
|
||||
);
|
||||
assert!(
|
||||
hash_set.remove(&name),
|
||||
"multiple configuration guides found for option {}",
|
||||
name
|
||||
);
|
||||
code_block.set_config_name(Some(name));
|
||||
}
|
||||
Some(ConfigurationSection::ConfigValue(value)) => {
|
||||
code_block.set_config_value(Some(value));
|
||||
}
|
||||
None => return None, // end of file was reached
|
||||
}
|
||||
}
|
||||
|
||||
Some(code_block)
|
||||
}
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn configuration_snippet_tests() {
|
||||
let blocks = get_code_blocks();
|
||||
let failures = blocks
|
||||
.iter()
|
||||
.map(ConfigCodeBlock::formatted_is_idempotent)
|
||||
.fold(0, |acc, r| acc + (!r as u32));
|
||||
|
||||
// Display results.
|
||||
println!("Ran {} configurations tests.", blocks.len());
|
||||
assert_eq!(failures, 0, "{} configurations tests failed", failures);
|
||||
}
|
||||
|
||||
// Read Configurations.md and build a `Vec` of `ConfigCodeBlock` structs with one
|
||||
// entry for each Rust code block found.
|
||||
fn get_code_blocks() -> Vec<ConfigCodeBlock> {
|
||||
let mut file_iter = BufReader::new(
|
||||
fs::File::open(Path::new(CONFIGURATIONS_FILE_NAME))
|
||||
.unwrap_or_else(|_| panic!("couldn't read file {}", CONFIGURATIONS_FILE_NAME)),
|
||||
)
|
||||
.lines()
|
||||
.map(Result::unwrap)
|
||||
.enumerate();
|
||||
let mut code_blocks: Vec<ConfigCodeBlock> = Vec::new();
|
||||
let mut hash_set = Config::hash_set();
|
||||
|
||||
while let Some(cb) = ConfigCodeBlock::extract(&mut file_iter, code_blocks.last(), &mut hash_set)
|
||||
{
|
||||
code_blocks.push(cb);
|
||||
}
|
||||
|
||||
for name in hash_set {
|
||||
if !Config::is_hidden_option(&name) {
|
||||
panic!("{} does not have a configuration guide", name);
|
||||
}
|
||||
}
|
||||
|
||||
code_blocks
|
||||
}
|
||||
284
src/test/mod.rs
284
src/test/mod.rs
@ -1,23 +1,24 @@
|
||||
use std::collections::{HashMap, HashSet};
|
||||
use std::collections::HashMap;
|
||||
use std::env;
|
||||
use std::fs;
|
||||
use std::io::{self, BufRead, BufReader, Read, Write};
|
||||
use std::iter::{Enumerate, Peekable};
|
||||
use std::iter::Peekable;
|
||||
use std::mem;
|
||||
use std::path::{Path, PathBuf};
|
||||
use std::process::{Command, Stdio};
|
||||
use std::str::Chars;
|
||||
use std::thread;
|
||||
|
||||
use crate::config::{Color, Config, EmitMode, FileName, NewlineStyle, ReportTactic, Verbosity};
|
||||
use crate::config::{Color, Config, EmitMode, FileName, NewlineStyle, ReportTactic};
|
||||
use crate::formatting::{ReportedErrors, SourceFile};
|
||||
use crate::is_nightly_channel;
|
||||
use crate::rustfmt_diff::{make_diff, print_diff, DiffLine, Mismatch, ModifiedChunk, OutputWriter};
|
||||
use crate::source_file;
|
||||
use crate::{FormatReport, FormatReportFormatterBuilder, Input, Session};
|
||||
|
||||
mod configuration_snippet;
|
||||
|
||||
const DIFF_CONTEXT_SIZE: usize = 3;
|
||||
const CONFIGURATIONS_FILE_NAME: &str = "Configurations.md";
|
||||
|
||||
// A list of files on which we want to skip testing.
|
||||
const SKIP_FILE_WHITE_LIST: &[&str] = &[
|
||||
@ -768,281 +769,6 @@ fn string_eq_ignore_newline_repr_test() {
|
||||
assert!(!string_eq_ignore_newline_repr("a\r\nbcd", "a\nbcdefghijk"));
|
||||
}
|
||||
|
||||
// This enum is used to represent one of three text features in Configurations.md: a block of code
|
||||
// with its starting line number, the name of a rustfmt configuration option, or the value of a
|
||||
// rustfmt configuration option.
|
||||
enum ConfigurationSection {
|
||||
CodeBlock((String, u32)), // (String: block of code, u32: line number of code block start)
|
||||
ConfigName(String),
|
||||
ConfigValue(String),
|
||||
}
|
||||
|
||||
impl ConfigurationSection {
|
||||
fn get_section<I: Iterator<Item = String>>(
|
||||
file: &mut Enumerate<I>,
|
||||
) -> Option<ConfigurationSection> {
|
||||
lazy_static! {
|
||||
static ref CONFIG_NAME_REGEX: regex::Regex =
|
||||
regex::Regex::new(r"^## `([^`]+)`").expect("failed creating configuration pattern");
|
||||
static ref CONFIG_VALUE_REGEX: regex::Regex =
|
||||
regex::Regex::new(r#"^#### `"?([^`"]+)"?`"#)
|
||||
.expect("failed creating configuration value pattern");
|
||||
}
|
||||
|
||||
loop {
|
||||
match file.next() {
|
||||
Some((i, line)) => {
|
||||
if line.starts_with("```rust") {
|
||||
// Get the lines of the code block.
|
||||
let lines: Vec<String> = file
|
||||
.map(|(_i, l)| l)
|
||||
.take_while(|l| !l.starts_with("```"))
|
||||
.collect();
|
||||
let block = format!("{}\n", lines.join("\n"));
|
||||
|
||||
// +1 to translate to one-based indexing
|
||||
// +1 to get to first line of code (line after "```")
|
||||
let start_line = (i + 2) as u32;
|
||||
|
||||
return Some(ConfigurationSection::CodeBlock((block, start_line)));
|
||||
} else if let Some(c) = CONFIG_NAME_REGEX.captures(&line) {
|
||||
return Some(ConfigurationSection::ConfigName(String::from(&c[1])));
|
||||
} else if let Some(c) = CONFIG_VALUE_REGEX.captures(&line) {
|
||||
return Some(ConfigurationSection::ConfigValue(String::from(&c[1])));
|
||||
}
|
||||
}
|
||||
None => return None, // reached the end of the file
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// This struct stores the information about code blocks in the configurations
|
||||
// file, formats the code blocks, and prints formatting errors.
|
||||
struct ConfigCodeBlock {
|
||||
config_name: Option<String>,
|
||||
config_value: Option<String>,
|
||||
code_block: Option<String>,
|
||||
code_block_start: Option<u32>,
|
||||
}
|
||||
|
||||
impl ConfigCodeBlock {
|
||||
fn new() -> ConfigCodeBlock {
|
||||
ConfigCodeBlock {
|
||||
config_name: None,
|
||||
config_value: None,
|
||||
code_block: None,
|
||||
code_block_start: None,
|
||||
}
|
||||
}
|
||||
|
||||
fn set_config_name(&mut self, name: Option<String>) {
|
||||
self.config_name = name;
|
||||
self.config_value = None;
|
||||
}
|
||||
|
||||
fn set_config_value(&mut self, value: Option<String>) {
|
||||
self.config_value = value;
|
||||
}
|
||||
|
||||
fn set_code_block(&mut self, code_block: String, code_block_start: u32) {
|
||||
self.code_block = Some(code_block);
|
||||
self.code_block_start = Some(code_block_start);
|
||||
}
|
||||
|
||||
fn get_block_config(&self) -> Config {
|
||||
let mut config = Config::default();
|
||||
config.set().verbose(Verbosity::Quiet);
|
||||
if self.config_name.is_some() && self.config_value.is_some() {
|
||||
config.override_value(
|
||||
self.config_name.as_ref().unwrap(),
|
||||
self.config_value.as_ref().unwrap(),
|
||||
);
|
||||
}
|
||||
config
|
||||
}
|
||||
|
||||
fn code_block_valid(&self) -> bool {
|
||||
// We never expect to not have a code block.
|
||||
assert!(self.code_block.is_some() && self.code_block_start.is_some());
|
||||
|
||||
// See if code block begins with #![rustfmt::skip].
|
||||
let fmt_skip = self
|
||||
.code_block
|
||||
.as_ref()
|
||||
.unwrap()
|
||||
.lines()
|
||||
.nth(0)
|
||||
.unwrap_or("")
|
||||
== "#![rustfmt::skip]";
|
||||
|
||||
if self.config_name.is_none() && !fmt_skip {
|
||||
write_message(&format!(
|
||||
"No configuration name for {}:{}",
|
||||
CONFIGURATIONS_FILE_NAME,
|
||||
self.code_block_start.unwrap()
|
||||
));
|
||||
return false;
|
||||
}
|
||||
if self.config_value.is_none() && !fmt_skip {
|
||||
write_message(&format!(
|
||||
"No configuration value for {}:{}",
|
||||
CONFIGURATIONS_FILE_NAME,
|
||||
self.code_block_start.unwrap()
|
||||
));
|
||||
return false;
|
||||
}
|
||||
true
|
||||
}
|
||||
|
||||
fn has_parsing_errors<T: Write>(&self, session: &Session<'_, T>) -> bool {
|
||||
if session.has_parsing_errors() {
|
||||
write_message(&format!(
|
||||
"\u{261d}\u{1f3fd} Cannot format {}:{}",
|
||||
CONFIGURATIONS_FILE_NAME,
|
||||
self.code_block_start.unwrap()
|
||||
));
|
||||
return true;
|
||||
}
|
||||
|
||||
false
|
||||
}
|
||||
|
||||
fn print_diff(&self, compare: Vec<Mismatch>) {
|
||||
let mut mismatches = HashMap::new();
|
||||
mismatches.insert(PathBuf::from(CONFIGURATIONS_FILE_NAME), compare);
|
||||
print_mismatches(mismatches, |line_num| {
|
||||
format!(
|
||||
"\nMismatch at {}:{}:",
|
||||
CONFIGURATIONS_FILE_NAME,
|
||||
line_num + self.code_block_start.unwrap() - 1
|
||||
)
|
||||
});
|
||||
}
|
||||
|
||||
fn formatted_has_diff(&self, text: &str) -> bool {
|
||||
let compare = make_diff(self.code_block.as_ref().unwrap(), text, DIFF_CONTEXT_SIZE);
|
||||
if !compare.is_empty() {
|
||||
self.print_diff(compare);
|
||||
return true;
|
||||
}
|
||||
|
||||
false
|
||||
}
|
||||
|
||||
// Return a bool indicating if formatting this code block is an idempotent
|
||||
// operation. This function also triggers printing any formatting failure
|
||||
// messages.
|
||||
fn formatted_is_idempotent(&self) -> bool {
|
||||
// Verify that we have all of the expected information.
|
||||
if !self.code_block_valid() {
|
||||
return false;
|
||||
}
|
||||
|
||||
let input = Input::Text(self.code_block.as_ref().unwrap().to_owned());
|
||||
let mut config = self.get_block_config();
|
||||
config.set().emit_mode(EmitMode::Stdout);
|
||||
let mut buf: Vec<u8> = vec![];
|
||||
|
||||
{
|
||||
let mut session = Session::new(config, Some(&mut buf));
|
||||
session.format(input).unwrap();
|
||||
if self.has_parsing_errors(&session) {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
!self.formatted_has_diff(&String::from_utf8(buf).unwrap())
|
||||
}
|
||||
|
||||
// Extract a code block from the iterator. Behavior:
|
||||
// - Rust code blocks are identifed by lines beginning with "```rust".
|
||||
// - One explicit configuration setting is supported per code block.
|
||||
// - Rust code blocks with no configuration setting are illegal and cause an
|
||||
// assertion failure, unless the snippet begins with #![rustfmt::skip].
|
||||
// - Configuration names in Configurations.md must be in the form of
|
||||
// "## `NAME`".
|
||||
// - Configuration values in Configurations.md must be in the form of
|
||||
// "#### `VALUE`".
|
||||
fn extract<I: Iterator<Item = String>>(
|
||||
file: &mut Enumerate<I>,
|
||||
prev: Option<&ConfigCodeBlock>,
|
||||
hash_set: &mut HashSet<String>,
|
||||
) -> Option<ConfigCodeBlock> {
|
||||
let mut code_block = ConfigCodeBlock::new();
|
||||
code_block.config_name = prev.and_then(|cb| cb.config_name.clone());
|
||||
|
||||
loop {
|
||||
match ConfigurationSection::get_section(file) {
|
||||
Some(ConfigurationSection::CodeBlock((block, start_line))) => {
|
||||
code_block.set_code_block(block, start_line);
|
||||
break;
|
||||
}
|
||||
Some(ConfigurationSection::ConfigName(name)) => {
|
||||
assert!(
|
||||
Config::is_valid_name(&name),
|
||||
"an unknown configuration option was found: {}",
|
||||
name
|
||||
);
|
||||
assert!(
|
||||
hash_set.remove(&name),
|
||||
"multiple configuration guides found for option {}",
|
||||
name
|
||||
);
|
||||
code_block.set_config_name(Some(name));
|
||||
}
|
||||
Some(ConfigurationSection::ConfigValue(value)) => {
|
||||
code_block.set_config_value(Some(value));
|
||||
}
|
||||
None => return None, // end of file was reached
|
||||
}
|
||||
}
|
||||
|
||||
Some(code_block)
|
||||
}
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn configuration_snippet_tests() {
|
||||
// Read Configurations.md and build a `Vec` of `ConfigCodeBlock` structs with one
|
||||
// entry for each Rust code block found.
|
||||
fn get_code_blocks() -> Vec<ConfigCodeBlock> {
|
||||
let mut file_iter = BufReader::new(
|
||||
fs::File::open(Path::new(CONFIGURATIONS_FILE_NAME))
|
||||
.unwrap_or_else(|_| panic!("couldn't read file {}", CONFIGURATIONS_FILE_NAME)),
|
||||
)
|
||||
.lines()
|
||||
.map(Result::unwrap)
|
||||
.enumerate();
|
||||
let mut code_blocks: Vec<ConfigCodeBlock> = Vec::new();
|
||||
let mut hash_set = Config::hash_set();
|
||||
|
||||
while let Some(cb) =
|
||||
ConfigCodeBlock::extract(&mut file_iter, code_blocks.last(), &mut hash_set)
|
||||
{
|
||||
code_blocks.push(cb);
|
||||
}
|
||||
|
||||
for name in hash_set {
|
||||
if !Config::is_hidden_option(&name) {
|
||||
panic!("{} does not have a configuration guide", name);
|
||||
}
|
||||
}
|
||||
|
||||
code_blocks
|
||||
}
|
||||
|
||||
let blocks = get_code_blocks();
|
||||
let failures = blocks
|
||||
.iter()
|
||||
.map(ConfigCodeBlock::formatted_is_idempotent)
|
||||
.fold(0, |acc, r| acc + (!r as u32));
|
||||
|
||||
// Display results.
|
||||
println!("Ran {} configurations tests.", blocks.len());
|
||||
assert_eq!(failures, 0, "{} configurations tests failed", failures);
|
||||
}
|
||||
|
||||
struct TempFile {
|
||||
path: PathBuf,
|
||||
}
|
||||
|
||||
70
tests/cargo-fmt/main.rs
Normal file
70
tests/cargo-fmt/main.rs
Normal file
@ -0,0 +1,70 @@
|
||||
// Integration tests for cargo-fmt.
|
||||
|
||||
use std::env;
|
||||
use std::process::Command;
|
||||
|
||||
/// Run the cargo-fmt executable and return its output.
|
||||
fn cargo_fmt(args: &[&str]) -> (String, String) {
|
||||
let mut bin_dir = env::current_exe().unwrap();
|
||||
bin_dir.pop(); // chop off test exe name
|
||||
if bin_dir.ends_with("deps") {
|
||||
bin_dir.pop();
|
||||
}
|
||||
let cmd = bin_dir.join(format!("cargo-fmt{}", env::consts::EXE_SUFFIX));
|
||||
|
||||
// Ensure cargo-fmt runs the rustfmt binary from the local target dir.
|
||||
let path = env::var_os("PATH").unwrap_or_default();
|
||||
let mut paths = env::split_paths(&path).collect::<Vec<_>>();
|
||||
paths.insert(0, bin_dir);
|
||||
let new_path = env::join_paths(paths).unwrap();
|
||||
|
||||
match Command::new(&cmd).args(args).env("PATH", new_path).output() {
|
||||
Ok(output) => (
|
||||
String::from_utf8(output.stdout).expect("utf-8"),
|
||||
String::from_utf8(output.stderr).expect("utf-8"),
|
||||
),
|
||||
Err(e) => panic!("failed to run `{:?} {:?}`: {}", cmd, args, e),
|
||||
}
|
||||
}
|
||||
|
||||
macro_rules! assert_that {
|
||||
($args:expr, $check:ident $check_args:tt) => {
|
||||
let (stdout, stderr) = cargo_fmt($args);
|
||||
if !stdout.$check$check_args {
|
||||
panic!(
|
||||
"Output not expected for cargo-fmt {:?}\n\
|
||||
expected: {}{}\n\
|
||||
actual stdout:\n{}\n\
|
||||
actual stderr:\n{}",
|
||||
$args,
|
||||
stringify!($check),
|
||||
stringify!($check_args),
|
||||
stdout,
|
||||
stderr
|
||||
);
|
||||
}
|
||||
};
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn version() {
|
||||
assert_that!(&["--version"], starts_with("rustfmt "));
|
||||
assert_that!(&["--version"], starts_with("rustfmt "));
|
||||
assert_that!(&["--", "-V"], starts_with("rustfmt "));
|
||||
assert_that!(&["--", "--version"], starts_with("rustfmt "));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn print_config() {
|
||||
assert_that!(
|
||||
&["--", "--print-config", "current", "."],
|
||||
contains("max_width = ")
|
||||
);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn rustfmt_help() {
|
||||
assert_that!(&["--", "--help"], contains("Format Rust code"));
|
||||
assert_that!(&["--", "-h"], contains("Format Rust code"));
|
||||
assert_that!(&["--", "--help=config"], contains("Configuration Options:"));
|
||||
}
|
||||
5
tests/source/issue-3675.rs
Normal file
5
tests/source/issue-3675.rs
Normal file
@ -0,0 +1,5 @@
|
||||
fn main() {
|
||||
println!("{}"
|
||||
// comment
|
||||
, 111);
|
||||
}
|
||||
6
tests/target/issue-3675.rs
Normal file
6
tests/target/issue-3675.rs
Normal file
@ -0,0 +1,6 @@
|
||||
fn main() {
|
||||
println!(
|
||||
"{}", // comment
|
||||
111
|
||||
);
|
||||
}
|
||||
Loading…
Reference in New Issue
Block a user