зеркало из https://github.com/mozilla/gecko-dev.git
servo: Merge #10713 - add tidy test for space after ":" in stucts (from aeischeid:master); r=jdm
Addresses issue #10702 the tidy self-test doesn't seem to catch the `member_name:"Foo"` line like it should. the regex follows similar pattern in the file and works in my regex tester tool, so not really sure what is going on there. Source-Repo: https://github.com/servo/servo Source-Revision: 8c2c0bd964bfbf1a2d7494bd8fbbdd263173ef7d
This commit is contained in:
Родитель
dad21c2a95
Коммит
0ca1c50fb0
|
@ -336,7 +336,8 @@ def check_rust(file_name, lines):
|
|||
|
||||
# get rid of strings and chars because cases like regex expression, keep attributes
|
||||
if not line_is_attribute(line):
|
||||
line = re.sub(r'"(\\.|[^\\"])*?"|' + r"'(\\.|[^\\'])*?'", '', line)
|
||||
line = re.sub(r'"(\\.|[^\\"])*?"', '""', line)
|
||||
line = re.sub(r"'(\\.|[^\\'])*?'", "''", line)
|
||||
|
||||
# get rid of comments
|
||||
line = re.sub('//.*?$|/\*.*?$|^\*.*?$', '', line)
|
||||
|
@ -373,7 +374,7 @@ def check_rust(file_name, lines):
|
|||
(r" :[^:]", "extra space before :",
|
||||
lambda match, line: 'trait ' not in line[:match.start()]),
|
||||
# ignore "crate::mod" and ignore flagging macros like "$t1:expr"
|
||||
(r"[^:]:[A-Za-z]", "missing space after :",
|
||||
(r"[^:]:[A-Za-z0-9\"]", "missing space after :",
|
||||
lambda match, line: '$' not in line[:match.end()]),
|
||||
(r"[A-Za-z0-9\)]{", "missing space before {{", no_filter),
|
||||
# ignore cases like "{}", "}`", "}}" and "use::std::{Foo, Bar}"
|
||||
|
|
|
@ -29,6 +29,10 @@ impl test {
|
|||
2 => 1,
|
||||
};
|
||||
let z = &Vec<T>;
|
||||
struct Member {
|
||||
member_name:"Foo"
|
||||
member_id:5
|
||||
}
|
||||
}
|
||||
|
||||
fn test_fun2(y : &String, z : &Vec<f32>) -> f32 {
|
||||
|
|
|
@ -66,6 +66,8 @@ class CheckTidiness(unittest.TestCase):
|
|||
self.assertEqual('missing space before -', errors.next()[2])
|
||||
self.assertEqual('missing space before *', errors.next()[2])
|
||||
self.assertEqual('missing space after =>', errors.next()[2])
|
||||
self.assertEqual('missing space after :', errors.next()[2])
|
||||
self.assertEqual('missing space after :', errors.next()[2])
|
||||
self.assertEqual('extra space before :', errors.next()[2])
|
||||
self.assertEqual('extra space before :', errors.next()[2])
|
||||
self.assertEqual('use &[T] instead of &Vec<T>', errors.next()[2])
|
||||
|
|
Загрузка…
Ссылка в новой задаче