diff --git a/components/style/values/specified/length.rs b/components/style/values/specified/length.rs index 4c4c4696636..f2681d08c1d 100644 --- a/components/style/values/specified/length.rs +++ b/components/style/values/specified/length.rs @@ -592,34 +592,12 @@ impl Parse for Length { } } -impl Either { - /// Parse a non-negative length or none +impl Either { + /// Parse a non-negative length #[inline] pub fn parse_non_negative_length(context: &ParserContext, input: &mut Parser) -> Result { - if input.try(|input| None_::parse(context, input)).is_ok() { - return Ok(Either::Second(None_)); - } - Length::parse_non_negative(context, input).map(Either::First) - } -} - -impl Either { - #[inline] - #[allow(missing_docs)] - pub fn parse_non_negative_length(context: &ParserContext, input: &mut Parser) -> Result { - if input.try(|input| Normal::parse(context, input)).is_ok() { - return Ok(Either::Second(Normal)); - } - Length::parse_internal(context, input, AllowedLengthType::NonNegative).map(Either::First) - } -} - -impl Either { - #[inline] - #[allow(missing_docs)] - pub fn parse_non_negative_length(context: &ParserContext, input: &mut Parser) -> Result { - if input.try(|input| Auto::parse(context, input)).is_ok() { - return Ok(Either::Second(Auto)); + if let Ok(v) = input.try(|input| T::parse(context, input)) { + return Ok(Either::Second(v)); } Length::parse_internal(context, input, AllowedLengthType::NonNegative).map(Either::First) }