diff options
| author | Nilstrieb <48135649+Nilstrieb@users.noreply.github.com> | 2021-11-17 22:22:48 +0100 |
|---|---|---|
| committer | Nilstrieb <48135649+Nilstrieb@users.noreply.github.com> | 2021-11-17 22:22:48 +0100 |
| commit | 495d8ed246ec659127ee646b55e0ea7874ecb82f (patch) | |
| tree | f3b339e3b4b475818dc6ef8f3b31c2c4a8a89145 | |
| parent | 7c7f58d5b7b5b453fde743bb058aa5770a37e57f (diff) | |
| download | rust-495d8ed246ec659127ee646b55e0ea7874ecb82f.tar.gz rust-495d8ed246ec659127ee646b55e0ea7874ecb82f.zip | |
tidy-ignore-leading-newlines
| -rw-r--r-- | src/tools/tidy/src/style.rs | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/src/tools/tidy/src/style.rs b/src/tools/tidy/src/style.rs index 022a3dfde82..6ece9477140 100644 --- a/src/tools/tidy/src/style.rs +++ b/src/tools/tidy/src/style.rs @@ -266,6 +266,8 @@ pub fn check(path: &Path, bad: &mut bool) { contains_ignore_directive(can_contain, &contents, "end-whitespace"); let mut skip_trailing_newlines = contains_ignore_directive(can_contain, &contents, "trailing-newlines"); + let mut skip_leading_newlines = + contains_ignore_directive(can_contain, &contents, "leading-newlines"); let mut skip_copyright = contains_ignore_directive(can_contain, &contents, "copyright"); let mut leading_new_lines = false; let mut trailing_new_lines = 0; @@ -350,7 +352,10 @@ pub fn check(path: &Path, bad: &mut bool) { } } if leading_new_lines { - tidy_error!(bad, "{}: leading newline", file.display()); + let mut err = |_| { + tidy_error!(bad, "{}: leading newline", file.display()); + }; + suppressible_tidy_err!(err, skip_leading_newlines, "mising leading newline"); } let mut err = |msg: &str| { tidy_error!(bad, "{}: {}", file.display(), msg); @@ -395,6 +400,9 @@ pub fn check(path: &Path, bad: &mut bool) { if let Directive::Ignore(false) = skip_trailing_newlines { tidy_error!(bad, "{}: ignoring trailing newlines unnecessarily", file.display()); } + if let Directive::Ignore(false) = skip_leading_newlines { + tidy_error!(bad, "{}: ignoring leading newlines unnecessarily", file.display()); + } if let Directive::Ignore(false) = skip_copyright { tidy_error!(bad, "{}: ignoring copyright unnecessarily", file.display()); } |
