diff options
| -rw-r--r-- | python/tidy/servo_tidy/tidy.py | 4 | ||||
| -rw-r--r-- | python/tidy/servo_tidy_tests/rust_tidy.rs | 1 | ||||
| -rw-r--r-- | python/tidy/servo_tidy_tests/test_tidy.py | 2 | ||||
| -rw-r--r-- | tests/unit/style/parsing/inherited_text.rs | 2 |
4 files changed, 8 insertions, 1 deletions
diff --git a/python/tidy/servo_tidy/tidy.py b/python/tidy/servo_tidy/tidy.py index 9b59b08e473..ae929d45c3c 100644 --- a/python/tidy/servo_tidy/tidy.py +++ b/python/tidy/servo_tidy/tidy.py @@ -612,6 +612,10 @@ def check_rust(file_name, lines): indent = len(original_line) - len(line) if not line.endswith(";") and '{' in line: yield (idx + 1, "use statement spans multiple lines") + if '{ ' in line: + yield (idx + 1, "extra space after {") + if ' }' in line: + yield (idx + 1, "extra space before }") # strip "use" from the begin and ";" from the end current_use = line[4:-1] if prev_use: diff --git a/python/tidy/servo_tidy_tests/rust_tidy.rs b/python/tidy/servo_tidy_tests/rust_tidy.rs index 25da55e5bf8..e7efa2c0cbb 100644 --- a/python/tidy/servo_tidy_tests/rust_tidy.rs +++ b/python/tidy/servo_tidy_tests/rust_tidy.rs @@ -3,6 +3,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ use app_units::Au; +use azure::azure_hl::{ AntialiasMode, Color, ColorPattern, CompositionOp }; use azure::azure_hl::{AntialiasMode, Color, ColorPattern, CompositionOp}; use euclid::size::Size2D; diff --git a/python/tidy/servo_tidy_tests/test_tidy.py b/python/tidy/servo_tidy_tests/test_tidy.py index f9ccf889ec0..91f1c54ab55 100644 --- a/python/tidy/servo_tidy_tests/test_tidy.py +++ b/python/tidy/servo_tidy_tests/test_tidy.py @@ -95,6 +95,8 @@ class CheckTidiness(unittest.TestCase): def test_rust(self): errors = tidy.collect_errors_for_files(iterFile('rust_tidy.rs'), [], [tidy.check_rust], print_text=False) + self.assertEqual('extra space after {', errors.next()[2]) + self.assertEqual('extra space before }', errors.next()[2]) self.assertEqual('use statement spans multiple lines', errors.next()[2]) self.assertEqual('missing space before }', errors.next()[2]) self.assertTrue('use statement is not in alphabetical order' in errors.next()[2]) diff --git a/tests/unit/style/parsing/inherited_text.rs b/tests/unit/style/parsing/inherited_text.rs index c8cea6aac29..366497cf969 100644 --- a/tests/unit/style/parsing/inherited_text.rs +++ b/tests/unit/style/parsing/inherited_text.rs @@ -74,7 +74,7 @@ fn text_emphasis_style_longhand_should_parse_properly() { #[test] fn test_text_emphasis_position() { use style::properties::longhands::text_emphasis_position; - use style::properties::longhands::text_emphasis_position::{HorizontalWritingModeValue, VerticalWritingModeValue }; + use style::properties::longhands::text_emphasis_position::{HorizontalWritingModeValue, VerticalWritingModeValue}; use style::properties::longhands::text_emphasis_position::SpecifiedValue; let over_right = parse_longhand!(text_emphasis_position, "over right"); |