Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-03 12:40:06 +01:00
Code Issues Projects Releases Packages Wiki Activity

fixes #7390 : tidy now check the order of mod declarations even whith attribute

Browse source
This commit is contained in:
Hugo Thiessard 2015-08-30 18:49:50 +02:00
parent 9b939546a6
commit e81e91207c
1 changed files with 25 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

25
python/tidy.py
View file

@ -203,6 +203,8 @@ def check_rust(file_name, contents):
uses = [] uses = []
mods = []
for idx, line in enumerate(contents): for idx, line in enumerate(contents):
# simplify the analysis # simplify the analysis
line = line.strip() line = line.strip()
@ -305,6 +307,29 @@ def check_rust(file_name, contents):
yield (idx + 1 - len(uses) + i, message + expected + found) yield (idx + 1 - len(uses) + i, message + expected + found)
uses = [] uses = []
# modules must be in the same line and alphabetically sorted
if line.startswith("mod ") or line.startswith("pub mod "):
mod = ""
if line.startswith("mod "):
mod = line[4:]
else:
mod = line[8:]
match = line.find(" {")
if match == -1:
if not mod.endswith(";"):
yield (idx + 1, "mod statement spans multiple lines")
mods.append(mod[:len(mod) - 1])
elif len(mods) > 0:
sorted_mods = sorted(mods)
for i in range(len(mods)):
if sorted_mods[i] != mods[i]:
message = "mod statement is not in alphabetical order"
expected = "\n\t\033[93mexpected: {}\033[0m".format(sorted_mods[i])
found = "\n\t\033[91mfound: {}\033[0m".format(mods[i])
yield (idx + 1 - len(mods) + i, message + expected + found)
mods = []
# Avoid flagging <Item=Foo> constructs # Avoid flagging <Item=Foo> constructs
def is_associated_type(match, line, index): def is_associated_type(match, line, index):