Skip to content

Commit a7c25c8

Browse files
committed
only report errors in verbose mode
1 parent 461e049 commit a7c25c8

File tree

4 files changed

+44
-11
lines changed

4 files changed

+44
-11
lines changed

Cargo.lock

Lines changed: 29 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "enforcer"
3-
version = "0.8.9"
3+
version = "0.8.10"
44
authors = ["Oliver Mueller <oliver.mueller@gmail.com>"]
55

66
[dependencies]

src/check.rs

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -27,24 +27,30 @@ fn check_content<'a>(input: &'a str,
2727
i += 1;
2828
if max_line_length.is_some() && line.len() > max_line_length.unwrap() {
2929
result |= LINE_TOO_LONG;
30-
let _ = logger.send(Some(format!("{}, line {}: error: LINE_TOO_LONG\n", filename, i)));
3130
}
3231
if line.ends_with(' ') || line.ends_with('\t') {
3332
result |= TRAILING_SPACES;
34-
let _ =
35-
logger.send(Some(format!("{}, line {}: error: TRAILING_SPACES\n", filename, i)));
3633
}
3734
if s == clean::TabStrategy::Untabify && line.contains("\t") {
3835
result |= HAS_TABS;
39-
let _ = logger.send(Some(format!("{}, line {}: error: HAS_TABS\n", filename, i)));
4036
}
4137
if line.as_bytes().iter().any(|x| *x > 127) {
42-
if verbose {
43-
let _ =
44-
logger.send(Some(format!("{}, line {}: error: non ASCII line\n", filename, i)));
45-
}
4638
result |= HAS_ILLEGAL_CHARACTERS;
4739
}
40+
if verbose {
41+
if (result & LINE_TOO_LONG) > 0 {
42+
let _ = logger.send(Some(format!("{}, line {}: error: LINE_TOO_LONG\n", filename, i)));
43+
}
44+
if (result & TRAILING_SPACES) > 0 {
45+
let _ = logger.send(Some(format!("{}, line {}: error: TRAILING_SPACES\n", filename, i)));
46+
}
47+
if (result & HAS_TABS) > 0 {
48+
let _ = logger.send(Some(format!("{}, line {}: error: HAS_TABS\n", filename, i)));
49+
}
50+
if (result & HAS_ILLEGAL_CHARACTERS) > 0 {
51+
let _ = logger.send(Some(format!("{}, line {}: error: non ASCII line\n", filename, i)));
52+
}
53+
}
4854
}
4955
Ok(result)
5056
}

src/main.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ extern crate memmap;
33
extern crate rustc_serialize;
44
extern crate docopt;
55
extern crate scoped_pool;
6-
#[macro_use]
76
extern crate log;
87
extern crate env_logger;
98
extern crate pbr;

0 commit comments

Comments
 (0)