|
14 | 14 |
|
15 | 15 | #![deny(warnings)]
|
16 | 16 |
|
| 17 | +extern crate env_logger; |
17 | 18 | extern crate getopts;
|
| 19 | +#[macro_use] |
| 20 | +extern crate log; |
18 | 21 | extern crate regex;
|
19 | 22 | extern crate serde;
|
20 | 23 | #[macro_use]
|
@@ -79,9 +82,10 @@ impl From<io::Error> for FormatDiffError {
|
79 | 82 | }
|
80 | 83 |
|
81 | 84 | fn main() {
|
| 85 | + let _ = env_logger::init(); |
| 86 | + |
82 | 87 | let mut opts = getopts::Options::new();
|
83 | 88 | opts.optflag("h", "help", "show this message");
|
84 |
| - opts.optflag("v", "verbose", "use verbose output"); |
85 | 89 | opts.optopt(
|
86 | 90 | "p",
|
87 | 91 | "skip-prefix",
|
@@ -115,43 +119,30 @@ fn run(opts: &getopts::Options) -> Result<(), FormatDiffError> {
|
115 | 119 | return Ok(());
|
116 | 120 | }
|
117 | 121 |
|
118 |
| - let verbose = matches.opt_present("v"); |
119 |
| - |
120 | 122 | let filter = matches
|
121 | 123 | .opt_str("f")
|
122 | 124 | .unwrap_or_else(|| DEFAULT_PATTERN.into());
|
123 | 125 |
|
124 |
| - |
125 | 126 | let skip_prefix = matches
|
126 | 127 | .opt_str("p")
|
127 | 128 | .and_then(|p| p.parse::<u32>().ok())
|
128 | 129 | .unwrap_or(0);
|
129 | 130 |
|
130 | 131 | let (files, ranges) = scan_diff(io::stdin(), skip_prefix, &filter)?;
|
131 | 132 |
|
132 |
| - run_rustfmt(&files, &ranges, verbose) |
| 133 | + run_rustfmt(&files, &ranges) |
133 | 134 | }
|
134 | 135 |
|
135 |
| -fn run_rustfmt( |
136 |
| - files: &HashSet<String>, |
137 |
| - ranges: &[Range], |
138 |
| - verbose: bool, |
139 |
| -) -> Result<(), FormatDiffError> { |
| 136 | +fn run_rustfmt(files: &HashSet<String>, ranges: &[Range]) -> Result<(), FormatDiffError> { |
140 | 137 | if files.is_empty() || ranges.is_empty() {
|
141 |
| - if verbose { |
142 |
| - println!("No files to format found"); |
143 |
| - } |
| 138 | + debug!("No files to format found"); |
144 | 139 | return Ok(());
|
145 | 140 | }
|
146 | 141 |
|
147 | 142 | let ranges_as_json = json::to_string(ranges).unwrap();
|
148 |
| - if verbose { |
149 |
| - print!("rustfmt"); |
150 |
| - for file in files { |
151 |
| - print!(" {:?}", file); |
152 |
| - } |
153 |
| - print!(" --file-lines {:?}", ranges_as_json); |
154 |
| - } |
| 143 | + |
| 144 | + debug!("Files: {:?}", files); |
| 145 | + debug!("Ranges: {:?}", ranges); |
155 | 146 |
|
156 | 147 | let exit_status = process::Command::new("rustfmt")
|
157 | 148 | .args(files)
|
|
0 commit comments