Skip to content
This repository was archived by the owner on Nov 24, 2023. It is now read-only.

Commit 47e9aab

Browse files
committed
example/fix-json: Apply suggestions from code review
1 parent 5d4c8c8 commit 47e9aab

File tree

1 file changed

+12
-14
lines changed

1 file changed

+12
-14
lines changed

examples/fix-json.rs

Lines changed: 12 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -2,19 +2,18 @@ extern crate failure;
22
extern crate rustfix;
33

44
use failure::Error;
5-
use std::{collections::HashMap, collections::HashSet, env, fs, process};
5+
use std::io::{stdin, BufReader, Read};
6+
use std::{collections::HashMap, collections::HashSet, env, fs};
67

78
fn main() -> Result<(), Error> {
8-
let args: Vec<String> = env::args().collect();
9-
let suggestions_file = match args.as_slice() {
10-
[_, suggestions_file] => suggestions_file,
11-
_ => {
12-
println!("USAGE: fix-json <suggestions-file>");
13-
process::exit(1);
14-
}
9+
let suggestions_file = env::args().nth(1).expect("USAGE: fix-json <file or -->");
10+
let suggestions = if suggestions_file == "--" {
11+
let mut buffer = String::new();
12+
BufReader::new(stdin()).read_to_string(&mut buffer)?;
13+
buffer
14+
} else {
15+
fs::read_to_string(&suggestions_file)?
1516
};
16-
17-
let suggestions = fs::read_to_string(&suggestions_file)?;
1817
let suggestions = rustfix::get_suggestions_from_json(
1918
&suggestions,
2019
&HashSet::new(),
@@ -27,14 +26,13 @@ fn main() -> Result<(), Error> {
2726
.snippet
2827
.file_name
2928
.clone();
30-
let entry = files.entry(file).or_insert(Vec::new());
31-
entry.push(suggestion);
29+
files.entry(file).or_insert_with(Vec::new).push(suggestion);
3230
}
3331

3432
for (source_file, suggestions) in &files {
35-
let source = fs::read_to_string(&source_file)?;
33+
let source = fs::read_to_string(source_file)?;
3634
let fixes = rustfix::apply_suggestions(&source, suggestions)?;
37-
fs::write(&source_file, fixes)?;
35+
fs::write(source_file, fixes)?;
3836
}
3937

4038
Ok(())

0 commit comments

Comments
 (0)