test fallout

This commit is contained in:
Nick Cameron 2017-02-21 16:59:14 +13:00
parent 3bbdb0355e
commit ba1202f6b3
6 changed files with 17 additions and 17 deletions

@ -99,8 +99,8 @@ fn format_crate(verbosity: Verbosity) -> Result<ExitStatus, std::io::Error> {
let files: Vec<_> = targets.into_iter()
.filter(|t| t.kind.should_format())
.inspect(|t| if verbosity == Verbosity::Verbose {
println!("[{:?}] {:?}", t.kind, t.path)
})
println!("[{:?}] {:?}", t.kind, t.path)
})
.map(|t| t.path)
.collect();

@ -348,16 +348,16 @@ fn determine_operation(matches: &Matches) -> FmtResult<Operation> {
try!(io::stdin().read_to_string(&mut buffer));
return Ok(Operation::Stdin {
input: buffer,
config_path: config_path,
});
input: buffer,
config_path: config_path,
});
}
// We append files from `--file-lines` later in `execute()`.
let files: Vec<_> = matches.free.iter().map(PathBuf::from).collect();
Ok(Operation::Format {
files: files,
config_path: config_path,
})
files: files,
config_path: config_path,
})
}

@ -76,7 +76,7 @@
/// .qux
/// ```
use {Indent, Shape};
use Shape;
use rewrite::{Rewrite, RewriteContext};
use utils::{wrap_str, first_line_width};
use expr::rewrite_call;

@ -1235,7 +1235,7 @@ impl Rewrite for ast::Arm {
let pats_str = format!("{}{}", pats_str, guard_str);
// Where the next text can start.
let mut line_start = trimmed_last_line_width(&pats_str);
let line_start = trimmed_last_line_width(&pats_str);
let body = match body.node {
ast::ExprKind::Block(ref block) if !is_unsafe_block(block) &&

@ -212,9 +212,9 @@ fn read_config(filename: &str) -> Config {
get_config(sig_comments.get("config").map(|x| &(*x)[..]))
} else {
get_config(Path::new(filename)
.with_extension("toml")
.file_name()
.and_then(std::ffi::OsStr::to_str))
.with_extension("toml")
.file_name()
.and_then(std::ffi::OsStr::to_str))
};
for (key, val) in &sig_comments {

@ -223,9 +223,9 @@ fn casts() {
fn indices() {
let x = (aaaaaaaaaaaaaaaaaaaaaaaaaaaa + bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb + cccccccccccccccc)
[x + y + z];
[x + y + z];
let y = (aaaaaaaaaaaaaaaaaaaaaaaaaaaa + bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb + cccccccccccccccc)
[xxxxx + yyyyy + zzzzz];
[xxxxx + yyyyy + zzzzz];
}
fn repeats() {
@ -292,6 +292,6 @@ fn issue1106() {
}
for entry in WalkDir::new(path)
.into_iter()
.filter_entry(|entry| exclusions.filter_entry(entry)) {}
.into_iter()
.filter_entry(|entry| exclusions.filter_entry(entry)) {}
}