aboutsummaryrefslogtreecommitdiffstats
path: root/python/tidy/servo_tidy/tidy.py
diff options
context:
space:
mode:
authorbors-servo <lbergstrom+bors@mozilla.com>2016-11-01 01:13:35 -0500
committerGitHub <noreply@github.com>2016-11-01 01:13:35 -0500
commit291f393723d22a582bb9a49ef7294ec14eca2127 (patch)
tree6bff5ca222554e11f70f48674f561593202e219f /python/tidy/servo_tidy/tidy.py
parentc69c6cf58bb31de36af98d4b84dfdec2724d5b5b (diff)
parent32ba45ab6fe350c70aaad0ed29b66995571186c7 (diff)
downloadservo-291f393723d22a582bb9a49ef7294ec14eca2127.tar.gz
servo-291f393723d22a582bb9a49ef7294ec14eca2127.zip
Auto merge of #13986 - iamrohit7:tidy-feature-attrs, r=Wafflespeanut
Make test-tidy check for alphabetical ordering of #![feature(...)] statements <!-- Please describe your changes on the following line: --> <!-- 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] These changes fix #13954 (github issue number if applicable). <!-- Either: --> - [X] There are tests for these changes OR - [ ] These changes do not require tests because _____ <!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. --> <!-- Reviewable:start --> --- This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/13986) <!-- Reviewable:end -->
Diffstat (limited to 'python/tidy/servo_tidy/tidy.py')
-rw-r--r--python/tidy/servo_tidy/tidy.py25
1 files changed, 25 insertions, 0 deletions
diff --git a/python/tidy/servo_tidy/tidy.py b/python/tidy/servo_tidy/tidy.py
index b0e420988d7..98eb8fa2d94 100644
--- a/python/tidy/servo_tidy/tidy.py
+++ b/python/tidy/servo_tidy/tidy.py
@@ -385,11 +385,14 @@ def check_rust(file_name, lines):
import_block = False
whitespace = False
+ is_lib_rs_file = file_name.endswith("lib.rs")
+
prev_use = None
prev_open_brace = False
current_indent = 0
prev_crate = {}
prev_mod = {}
+ prev_feature_name = ""
decl_message = "{} is not in alphabetical order"
decl_expected = "\n\t\033[93mexpected: {}\033[0m"
@@ -517,6 +520,28 @@ def check_rust(file_name, lines):
+ decl_found.format(crate_name))
prev_crate[indent] = crate_name
+ # check alphabetical order of feature attributes in lib.rs files
+ if is_lib_rs_file:
+ match = re.search(r"#!\[feature\((.*)\)\]", line)
+
+ if match:
+ features = map(lambda w: w.strip(), match.group(1).split(','))
+ sorted_features = sorted(features)
+ if sorted_features != features:
+ yield(idx + 1, decl_message.format("feature attribute")
+ + decl_expected.format(tuple(sorted_features))
+ + decl_found.format(tuple(features)))
+
+ if prev_feature_name > sorted_features[0]:
+ yield(idx + 1, decl_message.format("feature attribute")
+ + decl_expected.format(prev_feature_name + " after " + sorted_features[0])
+ + decl_found.format(prev_feature_name + " before " + sorted_features[0]))
+
+ prev_feature_name = sorted_features[0]
+ else:
+ # 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 "):