diff options
author | Pyfisch <pyfisch@gmail.com> | 2018-11-06 20:08:08 +0100 |
---|---|---|
committer | Pyfisch <pyfisch@gmail.com> | 2018-11-06 22:30:31 +0100 |
commit | 4a947dd7195c3ece1e4996a6bdf7c300bf6ec655 (patch) | |
tree | eb3cdb5e6a99aeb8e61b83c148b560933269177c /python/tidy | |
parent | 095d446ccda70c3174c31afe545bb11c22cf43be (diff) | |
download | servo-4a947dd7195c3ece1e4996a6bdf7c300bf6ec655.tar.gz servo-4a947dd7195c3ece1e4996a6bdf7c300bf6ec655.zip |
Remove import order check from test-tidy
Fix leaking file descriptor.
Diffstat (limited to 'python/tidy')
-rw-r--r-- | python/tidy/servo_tidy/tidy.py | 32 |
1 files changed, 0 insertions, 32 deletions
diff --git a/python/tidy/servo_tidy/tidy.py b/python/tidy/servo_tidy/tidy.py index 9059c1f9843..f8def74e57c 100644 --- a/python/tidy/servo_tidy/tidy.py +++ b/python/tidy/servo_tidy/tidy.py @@ -509,10 +509,8 @@ def check_rust(file_name, lines): is_lib_rs_file = file_name.endswith("lib.rs") - prev_use = None prev_open_brace = False multi_line_string = False - current_indent = 0 prev_crate = {} prev_mod = {} prev_feature_name = "" @@ -716,36 +714,6 @@ def check_rust(file_name, lines): # not a feature attribute line, so empty previous name prev_feature_name = "" - # imports must be in the same line, alphabetically sorted, and merged - # into a single import block - if line.startswith("use "): - import_block = True - if not line.endswith(";") and '{' in line: - yield (idx + 1, "use statement spans multiple lines") - if '{ ' in line: - yield (idx + 1, "extra space after {") - if ' }' in line: - yield (idx + 1, "extra space before }") - # strip "use" from the begin and ";" from the end - current_use = line[4:-1] - if prev_use: - current_use_cut = current_use.replace("{self,", ".").replace("{", ".") - prev_use_cut = prev_use.replace("{self,", ".").replace("{", ".") - if indent == current_indent and current_use_cut < prev_use_cut and check_alphabetical_order: - yield(idx + 1, decl_message.format("use statement") - + decl_expected.format(prev_use) - + decl_found.format(current_use)) - prev_use = current_use - current_indent = indent - - if whitespace or not import_block: - current_indent = 0 - - # do not allow blank lines in an import block - if import_block and whitespace and line.startswith("use "): - whitespace = False - yield(idx, "encountered whitespace following a use statement") - # modules must be in the same line and alphabetically sorted if line.startswith("mod ") or line.startswith("pub mod "): # strip /(pub )?mod/ from the left and ";" from the right |