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

style: A few minor formatting cleanups.

Browse source
This commit is contained in:
Emilio Cobos Álvarez 2017-08-18 16:10:41 +02:00
parent 48ce204cb2
commit 4763d05cf0
No known key found for this signature in database
GPG key ID: 056B727BB9C1027C
2 changed files with 30 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

26
components/style/parser.rs
View file

@ -61,13 +61,14 @@ pub struct ParserContext<'a> {
impl<'a> ParserContext<'a> { impl<'a> ParserContext<'a> {
/// Create a parser context. /// Create a parser context.
pub fn new(stylesheet_origin: Origin, pub fn new(
url_data: &'a UrlExtraData, stylesheet_origin: Origin,
error_reporter: &'a ParseErrorReporter, url_data: &'a UrlExtraData,
rule_type: Option<CssRuleType>, error_reporter: &'a ParseErrorReporter,
parsing_mode: ParsingMode, rule_type: Option<CssRuleType>,
quirks_mode: QuirksMode) parsing_mode: ParsingMode,
-> ParserContext<'a> { quirks_mode: QuirksMode,
) -> ParserContext<'a> {
ParserContext { ParserContext {
stylesheet_origin: stylesheet_origin, stylesheet_origin: stylesheet_origin,
url_data: url_data, url_data: url_data,
@ -88,7 +89,14 @@ impl<'a> ParserContext<'a> {
parsing_mode: ParsingMode, parsing_mode: ParsingMode,
quirks_mode: QuirksMode quirks_mode: QuirksMode
) -> ParserContext<'a> { ) -> ParserContext<'a> {
Self::new(Origin::Author, url_data, error_reporter, rule_type, parsing_mode, quirks_mode) Self::new(
Origin::Author,
url_data,
error_reporter,
rule_type,
parsing_mode,
quirks_mode,
)
} }
/// Create a parser context based on a previous context, but with a modified rule type. /// Create a parser context based on a previous context, but with a modified rule type.
@ -115,7 +123,7 @@ impl<'a> ParserContext<'a> {
error_reporter: &'a ParseErrorReporter, error_reporter: &'a ParseErrorReporter,
line_number_offset: u64, line_number_offset: u64,
parsing_mode: ParsingMode, parsing_mode: ParsingMode,
quirks_mode: QuirksMode quirks_mode: QuirksMode,
) -> ParserContext<'a> { ) -> ParserContext<'a> {
ParserContext { ParserContext {
stylesheet_origin: stylesheet_origin, stylesheet_origin: stylesheet_origin,

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

@ -158,8 +158,10 @@ impl<'a, 'i> AtRuleParser<'i> for TopLevelRuleParser<'a> {
name: CowRcStr<'i>, name: CowRcStr<'i>,
input: &mut Parser<'i, 't> input: &mut Parser<'i, 't>
) -> Result<AtRuleType<AtRulePrelude, CssRule>, ParseError<'i>> { ) -> Result<AtRuleType<AtRulePrelude, CssRule>, ParseError<'i>> {
let location = get_location_with_offset(input.current_source_location(), let location = get_location_with_offset(
self.context.line_number_offset); input.current_source_location(),
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 {
@ -241,8 +243,11 @@ impl<'a, 'i> AtRuleParser<'i> for TopLevelRuleParser<'a> {
} }
#[inline] #[inline]
fn parse_block<'t>(&mut self, prelude: AtRulePrelude, input: &mut Parser<'i, 't>) fn parse_block<'t>(
-> Result<CssRule, ParseError<'i>> { &mut self,
prelude: AtRulePrelude,
input: &mut Parser<'i, 't>
) -> Result<CssRule, ParseError<'i>> {
AtRuleParser::parse_block(&mut self.nested(), prelude, input) AtRuleParser::parse_block(&mut self.nested(), prelude, input)
} }
} }
@ -258,8 +263,10 @@ impl<'a, 'i> QualifiedRuleParser<'i> for TopLevelRuleParser<'a> {
type Error = SelectorParseError<'i, StyleParseError<'i>>; type Error = SelectorParseError<'i, StyleParseError<'i>>;
#[inline] #[inline]
fn parse_prelude<'t>(&mut self, input: &mut Parser<'i, 't>) fn parse_prelude<'t>(
-> Result<QualifiedRuleParserPrelude, ParseError<'i>> { &mut self,
input: &mut Parser<'i, 't>,
) -> Result<QualifiedRuleParserPrelude, ParseError<'i>> {
self.state = State::Body; self.state = State::Body;
QualifiedRuleParser::parse_prelude(&mut self.nested(), input) QualifiedRuleParser::parse_prelude(&mut self.nested(), input)
} }