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

style: return early when appropriate to deindent some dense code.

Browse source
This commit is contained in:
Emilio Cobos Álvarez 2017-06-02 12:41:45 +02:00
parent 9a8c5fa7b5
commit d6e703a9e9
No known key found for this signature in database
GPG key ID: 056B727BB9C1027C
1 changed files with 64 additions and 64 deletions
Download patch file Download diff file Expand all files Collapse all files

20
components/style/stylesheets.rs
View file

@ -1554,7 +1554,11 @@ impl<'a> AtRuleParser for TopLevelRuleParser<'a> {
self.context.line_number_offset); self.context.line_number_offset);
match_ignore_ascii_case! { name, match_ignore_ascii_case! { name,
"import" => { "import" => {
if self.state <= State::Imports { if self.state > State::Imports {
self.state = State::Invalid;
return Err(()) // "@import must be before any rule but @charset"
}
self.state = State::Imports; self.state = State::Imports;
let url_string = input.expect_url_or_string()?; let url_string = input.expect_url_or_string()?;
let specified_url = SpecifiedUrl::parse_from_string(url_string, &self.context)?; let specified_url = SpecifiedUrl::parse_from_string(url_string, &self.context)?;
@ -1589,14 +1593,14 @@ impl<'a> AtRuleParser for TopLevelRuleParser<'a> {
}, &mut |import_rule| { }, &mut |import_rule| {
Arc::new(self.shared_lock.wrap(import_rule)) Arc::new(self.shared_lock.wrap(import_rule))
}); });
return Ok(AtRuleType::WithoutBlock(CssRule::Import(arc))) return Ok(AtRuleType::WithoutBlock(CssRule::Import(arc)))
} else {
self.state = State::Invalid;
return Err(()) // "@import must be before any rule but @charset"
}
}, },
"namespace" => { "namespace" => {
if self.state <= State::Namespaces { if self.state > State::Namespaces {
self.state = State::Invalid;
return Err(()) // "@namespace must be before any rule but @charset and @import"
}
self.state = State::Namespaces; self.state = State::Namespaces;
let prefix_result = input.try(|input| input.expect_ident()); let prefix_result = input.try(|input| input.expect_ident());
@ -1622,10 +1626,6 @@ impl<'a> AtRuleParser for TopLevelRuleParser<'a> {
source_location: location, source_location: location,
}) })
)))) ))))
} else {
self.state = State::Invalid;
return Err(()) // "@namespace must be before any rule but @charset and @import"
}
}, },
// @charset is removed by rust-cssparser if it’s the first rule in the stylesheet // @charset is removed by rust-cssparser if it’s the first rule in the stylesheet
// anything left is invalid. // anything left is invalid.