about summary refs log tree commit diff
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2021-04-11 22:11:31 +0000
committerbors <bors@rust-lang.org>2021-04-11 22:11:31 +0000
commit3f8added7003120582953d4f3f43991fb3bb2798 (patch)
tree62da41c2c7a7ff08bf0ecf24baae3e3ea2164b1d
parenta8661245649f3d1c0dc5b23270bdac0bbd2d8f64 (diff)
parent761ef8fc53b0c752096ca89e925b9d6b817dc49c (diff)
downloadrust-3f8added7003120582953d4f3f43991fb3bb2798.tar.gz
rust-3f8added7003120582953d4f3f43991fb3bb2798.zip
Auto merge of #84100 - sjakobi:77548-reenable-check, r=jyn514
tidy: Re-enable the "ignoring line length unnecessarily" check

Closes #77548.
-rw-r--r--src/tools/tidy/src/style.rs8
1 files changed, 3 insertions, 5 deletions
diff --git a/src/tools/tidy/src/style.rs b/src/tools/tidy/src/style.rs
index e99dd453280..3d5f39e8c90 100644
--- a/src/tools/tidy/src/style.rs
+++ b/src/tools/tidy/src/style.rs
@@ -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());
         }