Skip to content

Commit

Permalink
Auto merge of rust-lang#84100 - sjakobi:77548-reenable-check, r=jyn514
Browse files Browse the repository at this point in the history
tidy: Re-enable the "ignoring line length unnecessarily" check

Closes rust-lang#77548.
  • Loading branch information
bors committed Apr 11, 2021
2 parents a866124 + 761ef8f commit 3f8adde
Showing 1 changed file with 3 additions and 5 deletions.
8 changes: 3 additions & 5 deletions src/tools/tidy/src/style.rs
Original file line number Diff line number Diff line change
Expand Up @@ -379,11 +379,9 @@ pub fn check(path: &Path, bad: &mut bool) {
if let Directive::Ignore(false) = skip_tab {
tidy_error!(bad, "{}: ignoring tab characters unnecessarily", file.display());
}
// FIXME: Temporarily disabled to simplify landing the ignore-rules for the line
// length check (https://github.com/rust-lang/rust/issues/77548):
//if let Directive::Ignore(false) = skip_line_length {
// tidy_error!(bad, "{}: ignoring line length unnecessarily", file.display());
//}
if let Directive::Ignore(false) = skip_line_length {
tidy_error!(bad, "{}: ignoring line length unnecessarily", file.display());
}
if let Directive::Ignore(false) = skip_file_length {
tidy_error!(bad, "{}: ignoring file length unnecessarily", file.display());
}
Expand Down

0 comments on commit 3f8adde

Please sign in to comment.