Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-07-23 15:23:42 +01:00
Code Issues Projects Releases Packages Wiki Activity

Auto merge of #9243 - PythonNut:master, r=Wafflespeanut

Browse source 
Fix literal braces in string formatting in tidy.py, fixes #9151

This should be pretty self-explanatory, it's less than a dozen bytes, after all. :)

Fixes #9151.
<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/9243)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2016-01-11 08:23:45 +05:30
commit 4143caaa57
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
python/tidy.py
View file

@ -315,12 +315,12 @@ def check_rust(file_name, lines):
# ignore "crate::mod" and ignore flagging macros like "$t1:expr" # ignore "crate::mod" and ignore flagging macros like "$t1:expr"
(r"[^:]:[A-Za-z]", "missing space after :", (r"[^:]:[A-Za-z]", "missing space after :",
lambda match, line: '$' not in line[:match.end()]), lambda match, line: '$' not in line[:match.end()]),
(r"[A-Za-z0-9\)]{", "missing space before {", no_filter), (r"[A-Za-z0-9\)]{", "missing space before {{", no_filter),
# ignore cases like "{}", "}`", "}}" and "use::std::{Foo, Bar}" # ignore cases like "{}", "}`", "}}" and "use::std::{Foo, Bar}"
(r"[^\s{}]}[^`]", "missing space before }", (r"[^\s{}]}[^`]", "missing space before }}",
lambda match, line: not re.match(r'^(pub )?use', line)), lambda match, line: not re.match(r'^(pub )?use', line)),
# ignore cases like "{}", "`{", "{{" and "use::std::{Foo, Bar}" # ignore cases like "{}", "`{", "{{" and "use::std::{Foo, Bar}"
(r"[^`]{[^\s{}]", "missing space after {", (r"[^`]{[^\s{}]", "missing space after {{",
lambda match, line: not re.match(r'^(pub )?use', line)), lambda match, line: not re.match(r'^(pub )?use', line)),
# There should not be any extra pointer dereferencing # There should not be any extra pointer dereferencing
(r": &Vec<", "use &[T] instead of &Vec<T>", no_filter), (r": &Vec<", "use &[T] instead of &Vec<T>", no_filter),
@ -475,7 +475,7 @@ def check_spec(file_name, lines):
# Pattern representing a line with comment # Pattern representing a line with comment
comment_patt = re.compile("^\s*///?.+$") comment_patt = re.compile("^\s*///?.+$")
pattern = "impl %sMethods for %s {" % (file_name, file_name) pattern = "impl {}Methods for {} {{".format(file_name, file_name)
brace_count = 0 brace_count = 0
in_impl = False in_impl = False
for idx, line in enumerate(lines): for idx, line in enumerate(lines):