servo: Merge #11472 - Report blank lines that follow an open brace (from jdm:wip); r=mbrubeck
This automates something that I find myself frequently commenting on in PRs. --- <!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `__` with appropriate data: --> - [X] `./mach build -d` does not report any errors - [X] `./mach test-tidy` does not report any errors - [X] There are tests for these changes OR <!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. --> Source-Repo: https://github.com/servo/servo Source-Revision: 3ec20d9cf517c67f4d280e8958cc58c4c2b4fbb2
This commit is contained in:
@@ -299,6 +299,7 @@ def check_rust(file_name, lines):
|
||||
whitespace = False
|
||||
|
||||
prev_use = None
|
||||
prev_open_brace = False
|
||||
current_indent = 0
|
||||
prev_crate = {}
|
||||
prev_mod = {}
|
||||
@@ -342,10 +343,10 @@ def check_rust(file_name, lines):
|
||||
line = re.sub(r"'(\\.|[^\\'])*?'", "''", line)
|
||||
|
||||
# get rid of comments
|
||||
line = re.sub('//.*?$|/\*.*?$|^\*.*?$', '', line)
|
||||
line = re.sub('//.*?$|/\*.*?$|^\*.*?$', '//', line)
|
||||
|
||||
# get rid of attributes that do not contain =
|
||||
line = re.sub('^#[A-Za-z0-9\(\)\[\]_]*?$', '', line)
|
||||
line = re.sub('^#[A-Za-z0-9\(\)\[\]_]*?$', '#[]', line)
|
||||
|
||||
# flag this line if it matches one of the following regular expressions
|
||||
# tuple format: (pattern, format_message, filter_function(match, line))
|
||||
@@ -401,6 +402,10 @@ def check_rust(file_name, lines):
|
||||
|
||||
yield (idx + 1, message.format(*match.groups(), **match.groupdict()))
|
||||
|
||||
if prev_open_brace and not line:
|
||||
yield (idx + 1, "found an empty line following a {")
|
||||
prev_open_brace = line.endswith("{")
|
||||
|
||||
# check alphabetical order of extern crates
|
||||
if line.startswith("extern crate "):
|
||||
# strip "extern crate " from the begin and ";" from the end
|
||||
|
||||
Reference in New Issue
Block a user