From: bors <bors@rust-lang.org>
Date: Sun, 9 Apr 2017 23:23:11 +0000 (+0000)
Subject: Auto merge of #40653 - frewsxcv:tidy-handling, r=alexcrichton
X-Git-Url: https://git.lizzy.rs/?a=commitdiff_plain;h=683fa7438ffe02c08a39ecfa8e997760e1090e7e;p=rust.git

Auto merge of #40653 - frewsxcv:tidy-handling, r=alexcrichton

A couple minor improvements for tidy error handling.

None
---

683fa7438ffe02c08a39ecfa8e997760e1090e7e
diff --cc src/tools/tidy/src/style.rs
index 012301299e0,081390eb93c..d545a03aa5c
--- a/src/tools/tidy/src/style.rs
+++ b/src/tools/tidy/src/style.rs
@@@ -110,11 -110,9 +110,10 @@@ pub fn check(path: &Path, bad: &mut boo
          let skip_cr = contents.contains("ignore-tidy-cr");
          let skip_tab = contents.contains("ignore-tidy-tab");
          let skip_length = contents.contains("ignore-tidy-linelength");
 +        let skip_end_whitespace = contents.contains("ignore-tidy-end-whitespace");
          for (i, line) in contents.split("\n").enumerate() {
              let mut err = |msg: &str| {
-                 println!("{}:{}: {}", file.display(), i + 1, msg);
-                 *bad = true;
+                 tidy_error!(bad, "{}:{}: {}", file.display(), i + 1, msg);
              };
              if !skip_length && line.chars().count() > COLS
                  && !long_line_is_ok(line) {