OpenE2K/rust
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Add end whitespace ignore flag for tidy

Browse Source
This commit is contained in:
Guillaume Gomez 2017-03-31 12:08:31 -06:00
parent 51d3cec387
commit 4de4a95505
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/test/rustdoc/check-hard-break.rs
View File

@ -10,7 +10,7 @@
#![crate_name = "foo"]
// ignore-tidy-linelength
// ignore-tidy-end-whitespace
// @has foo/fn.f.html
// @has - '<p>hard break:<br>after hard break</p>'

3
src/tools/tidy/src/style.rs
View File

@ -110,6 +110,7 @@ pub fn check(path: &Path, bad: &mut bool) {
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);
@ -122,7 +123,7 @@ pub fn check(path: &Path, bad: &mut bool) {
if line.contains("\t") && !skip_tab {
err("tab character");
}
if line.ends_with(" ") || line.ends_with("\t") {
if !skip_end_whitespace && (line.ends_with(" ") || line.ends_with("\t")) {
err("trailing whitespace");
}
if line.contains("\r") && !skip_cr {