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

Auto merge of #19237 - upsuper:error-nested-rule, r=emilio

Browse source 
Use InvalidRule for nested rule list

This fixes [bug 1417548](https://bugzilla.mozilla.org/show_bug.cgi?id=1417548).

Apparently it makes no sense to have different error between top level rules and nested rules.

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/19237)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2017-11-16 03:03:48 -06:00 • committed by GitHub
commit bf29f64bf6
2 changed files with 2 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
components/style/stylesheets/rule_parser.rs
View file

@ -331,7 +331,7 @@ impl<'a, 'b, R: ParseErrorReporter> NestedRuleParser<'a, 'b, R> {
Ok(rule) => rules.push(rule), Ok(rule) => rules.push(rule),
Err((error, slice)) => { Err((error, slice)) => {
let location = error.location; let location = error.location;
let error = ContextualParseError::UnsupportedRule(slice, error); let error = ContextualParseError::InvalidRule(slice, error);
self.context.log_css_error(self.error_context, location, error); self.context.log_css_error(self.error_context, location, error);
} }
} }

3
tests/unit/style/stylesheets.rs
View file

@ -354,9 +354,8 @@ fn test_report_error_stylesheet() {
// When @font-feature-values is supported, this should be replaced with two errors // When @font-feature-values is supported, this should be replaced with two errors
(15, 25, "Invalid rule: '@font-feature-values "), (15, 25, "Invalid rule: '@font-feature-values "),
// FIXME: the message of these two should be consistent
(16, 13, "Invalid rule: '@invalid'"), (16, 13, "Invalid rule: '@invalid'"),
(17, 29, "Unsupported rule: '@invalid'"), (17, 29, "Invalid rule: '@invalid'"),
(18, 34, "Invalid rule: '@supports "), (18, 34, "Invalid rule: '@supports "),
(19, 26, "Invalid keyframe rule: 'from invalid '"), (19, 26, "Invalid keyframe rule: 'from invalid '"),