diff --git a/components/style/properties/shorthand/position.mako.rs b/components/style/properties/shorthand/position.mako.rs index 49c7c54adbf..e5b07d616e4 100644 --- a/components/style/properties/shorthand/position.mako.rs +++ b/components/style/properties/shorthand/position.mako.rs @@ -52,15 +52,19 @@ use values::specified::NonNegativeNumber; use properties::longhands::flex_basis::SpecifiedValue as FlexBasis; - fn parse_flexibility<'i, 't>(context: &ParserContext, input: &mut Parser<'i, 't>) - -> Result<(NonNegativeNumber, Option),ParseError<'i>> { + fn parse_flexibility<'i, 't>( + context: &ParserContext, + input: &mut Parser<'i, 't>, + ) -> Result<(NonNegativeNumber, Option),ParseError<'i>> { let grow = NonNegativeNumber::parse(context, input)?; let shrink = input.try(|i| NonNegativeNumber::parse(context, i)).ok(); Ok((grow, shrink)) } - pub fn parse_value<'i, 't>(context: &ParserContext, input: &mut Parser<'i, 't>) - -> Result> { + pub fn parse_value<'i, 't>( + context: &ParserContext, + input: &mut Parser<'i, 't>, + ) -> Result> { let mut grow = None; let mut shrink = None; let mut basis = None; @@ -144,8 +148,10 @@ // NOTE: Since both the shorthands have the same code, we should (re-)use code from one to implement // the other. This might not be a big deal for now, but we should consider looking into this in the future // to limit the amount of code generated. - pub fn parse_value<'i, 't>(context: &ParserContext, input: &mut Parser<'i, 't>) - -> Result> { + pub fn parse_value<'i, 't>( + context: &ParserContext, + input: &mut Parser<'i, 't>, + ) -> Result> { let start = input.try(|i| GridLine::parse(context, i))?; let end = if input.try(|i| i.expect_delim('/')).is_ok() { GridLine::parse(context, input)? @@ -182,8 +188,10 @@ use parser::Parse; // The code is the same as `grid-{row,column}` except that this can have four values at most. - pub fn parse_value<'i, 't>(context: &ParserContext, input: &mut Parser<'i, 't>) - -> Result> { + pub fn parse_value<'i, 't>( + context: &ParserContext, + input: &mut Parser<'i, 't>, + ) -> Result> { fn line_with_ident_from(other: &GridLine) -> GridLine { let mut this = GridLine::auto(); if other.line_num.is_none() && !other.is_span { @@ -253,10 +261,10 @@ use values::specified::position::{TemplateAreas, TemplateAreasArc}; /// Parsing for `` shorthand (also used by `grid` shorthand). - pub fn parse_grid_template<'i, 't>(context: &ParserContext, input: &mut Parser<'i, 't>) - -> Result<(GridTemplateComponent, - GridTemplateComponent, - Either), ParseError<'i>> { + pub fn parse_grid_template<'i, 't>( + context: &ParserContext, + input: &mut Parser<'i, 't>, + ) -> Result<(GridTemplateComponent, GridTemplateComponent, Either), ParseError<'i>> { // Other shorthand sub properties also parse `none` and `subgrid` keywords and this // shorthand should know after these keywords there is nothing to parse. Otherwise it // gets confused and rejects the sub properties that contains `none` or `subgrid`. @@ -354,8 +362,10 @@ } #[inline] - pub fn parse_value<'i, 't>(context: &ParserContext, input: &mut Parser<'i, 't>) - -> Result> { + pub fn parse_value<'i, 't>( + context: &ParserContext, + input: &mut Parser<'i, 't>, + ) -> Result> { let (rows, columns, areas) = parse_grid_template(context, input)?; Ok(expanded! { grid_template_rows: rows, @@ -481,8 +491,10 @@ use values::specified::{GenericGridTemplateComponent, TrackSize}; use values::specified::position::{AutoFlow, GridAutoFlow}; - pub fn parse_value<'i, 't>(context: &ParserContext, input: &mut Parser<'i, 't>) - -> Result> { + pub fn parse_value<'i, 't>( + context: &ParserContext, + input: &mut Parser<'i, 't>, + ) -> Result> { let mut temp_rows = GridTemplateComponent::None; let mut temp_cols = GridTemplateComponent::None; let mut temp_areas = Either::Second(None_); @@ -490,8 +502,10 @@ let mut auto_cols = TrackSize::default(); let mut flow = grid_auto_flow::get_initial_value(); - fn parse_auto_flow<'i, 't>(input: &mut Parser<'i, 't>, is_row: bool) - -> Result> { + fn parse_auto_flow<'i, 't>( + input: &mut Parser<'i, 't>, + is_row: bool, + ) -> Result> { let mut auto_flow = None; let mut dense = false; for _ in 0..2 {