diff options
Diffstat (limited to 'python')
-rw-r--r-- | python/tidy/servo_tidy/tidy.py | 8 | ||||
-rw-r--r-- | python/tidy/servo_tidy_tests/ban-domrefcell.rs | 2 | ||||
-rw-r--r-- | python/tidy/servo_tidy_tests/ban.rs | 2 | ||||
-rw-r--r-- | python/tidy/servo_tidy_tests/test_tidy.py | 4 |
4 files changed, 8 insertions, 8 deletions
diff --git a/python/tidy/servo_tidy/tidy.py b/python/tidy/servo_tidy/tidy.py index cd4bf6feb97..d7c83ee8cee 100644 --- a/python/tidy/servo_tidy/tidy.py +++ b/python/tidy/servo_tidy/tidy.py @@ -575,10 +575,10 @@ def check_rust(file_name, lines): (r": &String", "use &str instead of &String", no_filter), # There should be any use of banned types: # Cell<JSVal>, Cell<Dom<T>>, DOMRefCell<Dom<T>>, DOMRefCell<HEAP<T>> - (r"(\s|:)+Cell<JSVal>", "Banned type Cell<JSVal> detected. Use MutJS<JSVal> instead", no_filter), - (r"(\s|:)+Cell<Dom<.+>>", "Banned type Cell<Dom<T>> detected. Use MutJS<T> instead", no_filter), - (r"DOMRefCell<Dom<.+>>", "Banned type DOMRefCell<Dom<T>> detected. Use MutJS<T> instead", no_filter), - (r"DOMRefCell<Heap<.+>>", "Banned type DOMRefCell<Heap<T>> detected. Use MutJS<T> instead", no_filter), + (r"(\s|:)+Cell<JSVal>", "Banned type Cell<JSVal> detected. Use MutDom<JSVal> instead", no_filter), + (r"(\s|:)+Cell<Dom<.+>>", "Banned type Cell<Dom<T>> detected. Use MutDom<T> instead", no_filter), + (r"DOMRefCell<Dom<.+>>", "Banned type DOMRefCell<Dom<T>> detected. Use MutDom<T> instead", no_filter), + (r"DOMRefCell<Heap<.+>>", "Banned type DOMRefCell<Heap<T>> detected. Use MutDom<T> instead", no_filter), # No benefit to using &Root<T> (r": &Root<", "use &T instead of &Root<T>", no_filter), (r"^&&", "operators should go at the end of the first line", no_filter), diff --git a/python/tidy/servo_tidy_tests/ban-domrefcell.rs b/python/tidy/servo_tidy_tests/ban-domrefcell.rs index f41358e7fa7..6d4e2b2fbc3 100644 --- a/python/tidy/servo_tidy_tests/ban-domrefcell.rs +++ b/python/tidy/servo_tidy_tests/ban-domrefcell.rs @@ -13,7 +13,7 @@ use script::test::Node; struct Foo { bar: DOMRefCell<Dom<Node>> - //~^ ERROR Banned type DOMRefCell<Dom<T>> detected. Use MutJS<T> instead + //~^ ERROR Banned type DOMRefCell<Dom<T>> detected. Use MutDom<T> instead } fn main() {} diff --git a/python/tidy/servo_tidy_tests/ban.rs b/python/tidy/servo_tidy_tests/ban.rs index f828053d289..fc5c600041a 100644 --- a/python/tidy/servo_tidy_tests/ban.rs +++ b/python/tidy/servo_tidy_tests/ban.rs @@ -13,7 +13,7 @@ use std::cell::UnsafeCell; struct Foo { bar: Cell<JSVal>, - //~^ ERROR Banned type Cell<JSVal> detected. Use MutJS<JSVal> instead + //~^ ERROR Banned type Cell<JSVal> detected. Use MutDom<JSVal> instead foo: UnsafeCell<JSVal> //~^ NOT AN ERROR } diff --git a/python/tidy/servo_tidy_tests/test_tidy.py b/python/tidy/servo_tidy_tests/test_tidy.py index ce9906f5549..3761975c62b 100644 --- a/python/tidy/servo_tidy_tests/test_tidy.py +++ b/python/tidy/servo_tidy_tests/test_tidy.py @@ -147,11 +147,11 @@ class CheckTidiness(unittest.TestCase): self.assertNoMoreErrors(feature_errors) ban_errors = tidy.collect_errors_for_files(iterFile('ban.rs'), [], [tidy.check_rust], print_text=False) - self.assertEqual('Banned type Cell<JSVal> detected. Use MutJS<JSVal> instead', ban_errors.next()[2]) + self.assertEqual('Banned type Cell<JSVal> detected. Use MutDom<JSVal> instead', ban_errors.next()[2]) self.assertNoMoreErrors(ban_errors) ban_errors = tidy.collect_errors_for_files(iterFile('ban-domrefcell.rs'), [], [tidy.check_rust], print_text=False) - self.assertEqual('Banned type DOMRefCell<Dom<T>> detected. Use MutJS<T> instead', ban_errors.next()[2]) + self.assertEqual('Banned type DOMRefCell<Dom<T>> detected. Use MutDom<T> instead', ban_errors.next()[2]) self.assertNoMoreErrors(ban_errors) def test_spec_link(self): |