Update rustfmt to 0.9.0.
This commit is contained in:
@@ -18,14 +18,14 @@ pub fn run(files: Vec<String>, verbose: bool) -> CommandResult {
|
||||
}
|
||||
|
||||
let mut buffer = String::new();
|
||||
io::stdin()
|
||||
.read_to_string(&mut buffer)
|
||||
.map_err(|e| format!("stdin: {}", e))?;
|
||||
io::stdin().read_to_string(&mut buffer).map_err(|e| {
|
||||
format!("stdin: {}", e)
|
||||
})?;
|
||||
|
||||
if verbose {
|
||||
let (success, explain) = checker
|
||||
.explain(&buffer, NO_VARIABLES)
|
||||
.map_err(|e| e.to_string())?;
|
||||
let (success, explain) = checker.explain(&buffer, NO_VARIABLES).map_err(
|
||||
|e| e.to_string(),
|
||||
)?;
|
||||
print!("{}", explain);
|
||||
if success {
|
||||
println!("OK");
|
||||
@@ -33,25 +33,27 @@ pub fn run(files: Vec<String>, verbose: bool) -> CommandResult {
|
||||
} else {
|
||||
Err("Check failed".to_string())
|
||||
}
|
||||
} else if checker
|
||||
.check(&buffer, NO_VARIABLES)
|
||||
.map_err(|e| e.to_string())? {
|
||||
} else if checker.check(&buffer, NO_VARIABLES).map_err(
|
||||
|e| e.to_string(),
|
||||
)?
|
||||
{
|
||||
Ok(())
|
||||
} else {
|
||||
let (_, explain) = checker
|
||||
.explain(&buffer, NO_VARIABLES)
|
||||
.map_err(|e| e.to_string())?;
|
||||
let (_, explain) = checker.explain(&buffer, NO_VARIABLES).map_err(
|
||||
|e| e.to_string(),
|
||||
)?;
|
||||
print!("{}", explain);
|
||||
Err("Check failed".to_string())
|
||||
}
|
||||
}
|
||||
|
||||
fn read_checkfile(filename: &str) -> Result<Checker, String> {
|
||||
let buffer = read_to_string(&filename)
|
||||
.map_err(|e| format!("{}: {}", filename, e))?;
|
||||
let buffer = read_to_string(&filename).map_err(
|
||||
|e| format!("{}: {}", filename, e),
|
||||
)?;
|
||||
let mut builder = CheckerBuilder::new();
|
||||
builder
|
||||
.text(&buffer)
|
||||
.map_err(|e| format!("{}: {}", filename, e))?;
|
||||
builder.text(&buffer).map_err(
|
||||
|e| format!("{}: {}", filename, e),
|
||||
)?;
|
||||
Ok(builder.finish())
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user