diff options
author | Simon Sapin <simon.sapin@exyr.org> | 2020-04-08 15:57:49 +0200 |
---|---|---|
committer | Simon Sapin <simon.sapin@exyr.org> | 2020-04-08 15:59:17 +0200 |
commit | 4227425c1e6374857b3d881a1d3963be27141576 (patch) | |
tree | a5a1e372ff0ceda3a71e1e20a4267cbe89dde05e /python/tidy | |
parent | 651b087155c09301f6762b7b58b14be8f6334ccf (diff) | |
download | servo-4227425c1e6374857b3d881a1d3963be27141576.tar.gz servo-4227425c1e6374857b3d881a1d3963be27141576.zip |
Remove the lint added in https://github.com/servo/servo/pull/14589
Per https://play.rust-lang.org/?version=stable&mode=debug&edition=2018&gist=a8a5a716b3bdf52fa7960a1e4ee89add
it looks like the drop order of temporaries was changed at some point and this pattern is no longer problematic.
Diffstat (limited to 'python/tidy')
-rw-r--r-- | python/tidy/servo_tidy/tidy.py | 3 | ||||
-rw-r--r-- | python/tidy/servo_tidy_tests/script_thread.rs | 18 | ||||
-rw-r--r-- | python/tidy/servo_tidy_tests/test_tidy.py | 6 |
3 files changed, 0 insertions, 27 deletions
diff --git a/python/tidy/servo_tidy/tidy.py b/python/tidy/servo_tidy/tidy.py index cbbb1a542d4..cfeef216869 100644 --- a/python/tidy/servo_tidy/tidy.py +++ b/python/tidy/servo_tidy/tidy.py @@ -625,9 +625,6 @@ def check_rust(file_name, lines): (r": &Root<", "use &T instead of &Root<T>", no_filter), (r": &DomRoot<", "use &T instead of &DomRoot<T>", no_filter), (r"^&&", "operators should go at the end of the first line", no_filter), - # This particular pattern is not reentrant-safe in script_thread.rs - (r"match self.documents.borrow", "use a separate variable for the match expression", - lambda match, line: file_name.endswith('script_thread.rs')), # -> () is unnecessary (r"-> \(\)", "encountered function signature with -> ()", no_filter), ] diff --git a/python/tidy/servo_tidy_tests/script_thread.rs b/python/tidy/servo_tidy_tests/script_thread.rs deleted file mode 100644 index 5dbeaec0e17..00000000000 --- a/python/tidy/servo_tidy_tests/script_thread.rs +++ /dev/null @@ -1,18 +0,0 @@ -fn main() { - // This should trigger an error. - match self.documents.borrow_mut() { - _ => {} - } - // This should trigger an error. - match self.documents.borrow() { - _ => {} - } - // This should not trigger an error. - match { self.documents.borrow().find_window(id) } { - => {} - } - // This should not trigger an error. - match self.documents_status.borrow() { - => {} - } -} diff --git a/python/tidy/servo_tidy_tests/test_tidy.py b/python/tidy/servo_tidy_tests/test_tidy.py index 441e9250c51..12f384b8674 100644 --- a/python/tidy/servo_tidy_tests/test_tidy.py +++ b/python/tidy/servo_tidy_tests/test_tidy.py @@ -140,12 +140,6 @@ class CheckTidiness(unittest.TestCase): self.assertEqual('method declared in webidl is missing a comment with a specification link', next(errors)[2]) self.assertNoMoreErrors(errors) - def test_script_thread(self): - errors = tidy.collect_errors_for_files(iterFile('script_thread.rs'), [], [tidy.check_rust], print_text=False) - self.assertEqual('use a separate variable for the match expression', next(errors)[2]) - self.assertEqual('use a separate variable for the match expression', next(errors)[2]) - self.assertNoMoreErrors(errors) - def test_webidl(self): errors = tidy.collect_errors_for_files(iterFile('spec.webidl'), [tidy.check_webidl_spec], [], print_text=False) self.assertEqual('No specification link found.', next(errors)[2]) |