Skip to content

Commit 8515475

Browse files
committed
get rid of some tidy 'unnecessarily ignored' warnings
1 parent 7425fb2 commit 8515475

File tree

1 file changed

+4
-9
lines changed

1 file changed

+4
-9
lines changed

src/tools/tidy/src/style.rs

+4-9
Original file line numberDiff line numberDiff line change
@@ -395,9 +395,6 @@ pub fn check(path: &Path, bad: &mut bool) {
395395
);
396396
};
397397
suppressible_tidy_err!(err, skip_file_length, "");
398-
} else if lines > (LINES * 7) / 10 {
399-
// Just set it to something that doesn't trigger the "unnecessarily ignored" warning.
400-
skip_file_length = Directive::Ignore(true);
401398
}
402399

403400
if let Directive::Ignore(false) = skip_cr {
@@ -406,12 +403,6 @@ pub fn check(path: &Path, bad: &mut bool) {
406403
if let Directive::Ignore(false) = skip_tab {
407404
tidy_error!(bad, "{}: ignoring tab characters unnecessarily", file.display());
408405
}
409-
if let Directive::Ignore(false) = skip_line_length {
410-
tidy_error!(bad, "{}: ignoring line length unnecessarily", file.display());
411-
}
412-
if let Directive::Ignore(false) = skip_file_length {
413-
tidy_error!(bad, "{}: ignoring file length unnecessarily", file.display());
414-
}
415406
if let Directive::Ignore(false) = skip_end_whitespace {
416407
tidy_error!(bad, "{}: ignoring trailing whitespace unnecessarily", file.display());
417408
}
@@ -424,5 +415,9 @@ pub fn check(path: &Path, bad: &mut bool) {
424415
if let Directive::Ignore(false) = skip_copyright {
425416
tidy_error!(bad, "{}: ignoring copyright unnecessarily", file.display());
426417
}
418+
// We deliberately do not warn about these being unnecessary,
419+
// that would just lead to annoying churn.
420+
let _unused = skip_line_length;
421+
let _unused = skip_file_length;
427422
})
428423
}

0 commit comments

Comments
 (0)