diff --git a/components/style/counter_style/mod.rs b/components/style/counter_style/mod.rs index 59556a04a88..a346f9d21af 100644 --- a/components/style/counter_style/mod.rs +++ b/components/style/counter_style/mod.rs @@ -370,7 +370,7 @@ impl Parse for System { "symbolic" => Ok(System::Symbolic), "additive" => Ok(System::Additive), "fixed" => { - let first_symbol_value = input.r#try(|i| Integer::parse(context, i)).ok(); + let first_symbol_value = input.try(|i| Integer::parse(context, i)).ok(); Ok(System::Fixed { first_symbol_value: first_symbol_value }) } "extends" => { @@ -457,7 +457,7 @@ impl Parse for Negative { ) -> Result> { Ok(Negative( Symbol::parse(context, input)?, - input.r#try(|input| Symbol::parse(context, input)).ok(), + input.try(|input| Symbol::parse(context, input)).ok(), )) } } @@ -483,7 +483,7 @@ impl Parse for Ranges { input: &mut Parser<'i, 't>, ) -> Result> { if input - .r#try(|input| input.expect_ident_matching("auto")) + .try(|input| input.expect_ident_matching("auto")) .is_ok() { Ok(Ranges(Vec::new())) @@ -512,7 +512,7 @@ fn parse_bound<'i, 't>( context: &ParserContext, input: &mut Parser<'i, 't>, ) -> Result> { - if let Ok(integer) = input.r#try(|input| Integer::parse(context, input)) { + if let Ok(integer) = input.try(|input| Integer::parse(context, input)) { return Ok(CounterBound::Integer(integer)); } input.expect_ident_matching("infinite")?; @@ -556,7 +556,7 @@ impl Parse for Pad { context: &ParserContext, input: &mut Parser<'i, 't>, ) -> Result> { - let pad_with = input.r#try(|input| Symbol::parse(context, input)); + let pad_with = input.try(|input| Symbol::parse(context, input)); let min_length = Integer::parse_non_negative(context, input)?; let pad_with = pad_with.or_else(|_| Symbol::parse(context, input))?; Ok(Pad(min_length, pad_with)) @@ -588,7 +588,7 @@ impl Parse for Symbols { ) -> Result> { let mut symbols = Vec::new(); loop { - if let Ok(s) = input.r#try(|input| Symbol::parse(context, input)) { + if let Ok(s) = input.try(|input| Symbol::parse(context, input)) { symbols.push(s) } else { if symbols.is_empty() { @@ -640,7 +640,7 @@ impl Parse for AdditiveTuple { context: &ParserContext, input: &mut Parser<'i, 't>, ) -> Result> { - let symbol = input.r#try(|input| Symbol::parse(context, input)); + let symbol = input.try(|input| Symbol::parse(context, input)); let weight = Integer::parse_non_negative(context, input)?; let symbol = symbol.or_else(|_| Symbol::parse(context, input))?; Ok(AdditiveTuple { @@ -673,7 +673,7 @@ impl Parse for SpeakAs { input: &mut Parser<'i, 't>, ) -> Result> { let mut is_spell_out = false; - let result = input.r#try(|input| { + let result = input.try(|input| { let ident = input.expect_ident().map_err(|_| ())?; match_ignore_ascii_case! { &*ident, "auto" => Ok(SpeakAs::Auto), diff --git a/components/style/custom_properties.rs b/components/style/custom_properties.rs index 5bd97241b67..31c3dc207f5 100644 --- a/components/style/custom_properties.rs +++ b/components/style/custom_properties.rs @@ -553,7 +553,7 @@ fn parse_var_function<'i, 't>( let name = parse_name(&name).map_err(|()| { input.new_custom_error(SelectorParseErrorKind::UnexpectedIdent(name.clone())) })?; - if input.r#try(|input| input.expect_comma()).is_ok() { + if input.try(|input| input.expect_comma()).is_ok() { parse_fallback(input)?; } if let Some(refs) = references { @@ -569,7 +569,7 @@ fn parse_env_function<'i, 't>( // TODO(emilio): This should be per spec, but no other // browser does that, see https://github.com/w3c/csswg-drafts/issues/3262. input.expect_ident()?; - if input.r#try(|input| input.expect_comma()).is_ok() { + if input.try(|input| input.expect_comma()).is_ok() { parse_fallback(input)?; } if let Some(references) = references { diff --git a/components/style/font_face.rs b/components/style/font_face.rs index 92444b7b145..8b3e3c865cb 100644 --- a/components/style/font_face.rs +++ b/components/style/font_face.rs @@ -120,7 +120,7 @@ macro_rules! impl_range { ) -> Result> { let first = $component::parse(context, input)?; let second = input - .r#try(|input| $component::parse(context, input)) + .try(|input| $component::parse(context, input)) .unwrap_or_else(|_| first.clone()); Ok($range(first, second)) } @@ -234,7 +234,7 @@ impl Parse for FontStyle { GenericFontStyle::Italic => FontStyle::Italic, GenericFontStyle::Oblique(angle) => { let second_angle = input - .r#try(|input| SpecifiedFontStyle::parse_angle(context, input)) + .try(|input| SpecifiedFontStyle::parse_angle(context, input)) .unwrap_or_else(|_| angle.clone()); FontStyle::Oblique(angle, second_angle) @@ -380,7 +380,7 @@ impl Parse for Source { input: &mut Parser<'i, 't>, ) -> Result> { if input - .r#try(|input| input.expect_function_matching("local")) + .try(|input| input.expect_function_matching("local")) .is_ok() { return input @@ -392,7 +392,7 @@ impl Parse for Source { // Parsing optional format() let format_hints = if input - .r#try(|input| input.expect_function_matching("format")) + .try(|input| input.expect_function_matching("format")) .is_ok() { input.parse_nested_block(|input| { diff --git a/components/style/media_queries/media_condition.rs b/components/style/media_queries/media_condition.rs index c0b8f49b566..b7da1503b33 100644 --- a/components/style/media_queries/media_condition.rs +++ b/components/style/media_queries/media_condition.rs @@ -114,7 +114,7 @@ impl MediaCondition { // ParenthesisBlock. let first_condition = Self::parse_paren_block(context, input)?; - let operator = match input.r#try(Operator::parse) { + let operator = match input.try(Operator::parse) { Ok(op) => op, Err(..) => return Ok(first_condition), }; @@ -133,7 +133,7 @@ impl MediaCondition { }; loop { - if input.r#try(|i| i.expect_ident_matching(delim)).is_err() { + if input.try(|i| i.expect_ident_matching(delim)).is_err() { return Ok(MediaCondition::Operation( conditions.into_boxed_slice(), operator, @@ -159,7 +159,7 @@ impl MediaCondition { ) -> Result> { input.parse_nested_block(|input| { // Base case. - if let Ok(inner) = input.r#try(|i| Self::parse(context, i)) { + if let Ok(inner) = input.try(|i| Self::parse(context, i)) { return Ok(MediaCondition::InParens(Box::new(inner))); } let expr = MediaFeatureExpression::parse_in_parenthesis_block(context, input)?; diff --git a/components/style/media_queries/media_feature_expression.rs b/components/style/media_queries/media_feature_expression.rs index 67c1f3b527a..b6bfc03179d 100644 --- a/components/style/media_queries/media_feature_expression.rs +++ b/components/style/media_queries/media_feature_expression.rs @@ -221,14 +221,14 @@ fn consume_operation_or_colon(input: &mut Parser) -> Result, () Ok(Some(match first_delim { '=' => Operator::Equal, '>' => { - if input.r#try(|i| i.expect_delim('=')).is_ok() { + if input.try(|i| i.expect_delim('=')).is_ok() { Operator::GreaterThanEqual } else { Operator::GreaterThan } }, '<' => { - if input.r#try(|i| i.expect_delim('=')).is_ok() { + if input.try(|i| i.expect_delim('=')).is_ok() { Operator::LessThanEqual } else { Operator::LessThan @@ -350,7 +350,7 @@ impl MediaFeatureExpression { } } - let operator = input.r#try(consume_operation_or_colon); + let operator = input.try(consume_operation_or_colon); let operator = match operator { Err(..) => { // If there's no colon, this is a media query of the diff --git a/components/style/media_queries/media_query.rs b/components/style/media_queries/media_query.rs index 61e2e06c573..88ad288bf3b 100644 --- a/components/style/media_queries/media_query.rs +++ b/components/style/media_queries/media_query.rs @@ -125,8 +125,8 @@ impl MediaQuery { input: &mut Parser<'i, 't>, ) -> Result> { let (qualifier, explicit_media_type) = input - .r#try(|input| -> Result<_, ()> { - let qualifier = input.r#try(Qualifier::parse).ok(); + .try(|input| -> Result<_, ()> { + let qualifier = input.try(Qualifier::parse).ok(); let ident = input.expect_ident().map_err(|_| ())?; let media_type = MediaQueryType::parse(&ident)?; Ok((qualifier, Some(media_type))) @@ -135,7 +135,7 @@ impl MediaQuery { let condition = if explicit_media_type.is_none() { Some(MediaCondition::parse(context, input)?) - } else if input.r#try(|i| i.expect_ident_matching("and")).is_ok() { + } else if input.try(|i| i.expect_ident_matching("and")).is_ok() { Some(MediaCondition::parse_disallow_or(context, input)?) } else { None diff --git a/components/style/stylesheets/document_rule.rs b/components/style/stylesheets/document_rule.rs index f0389b8fec9..6a3571910be 100644 --- a/components/style/stylesheets/document_rule.rs +++ b/components/style/stylesheets/document_rule.rs @@ -135,7 +135,7 @@ impl DocumentMatchingFunction { context: &ParserContext, input: &mut Parser<'i, 't>, ) -> Result> { - if let Ok(url) = input.r#try(|input| CssUrl::parse(context, input)) { + if let Ok(url) = input.try(|input| CssUrl::parse(context, input)) { return Ok(DocumentMatchingFunction::Url(url)); } diff --git a/components/style/stylesheets/rule_parser.rs b/components/style/stylesheets/rule_parser.rs index afb6debc1e1..bb51536d3f1 100644 --- a/components/style/stylesheets/rule_parser.rs +++ b/components/style/stylesheets/rule_parser.rs @@ -202,7 +202,7 @@ impl<'a, 'i> AtRuleParser<'i> for TopLevelRuleParser<'a> { return Err(input.new_custom_error(StyleParseErrorKind::UnexpectedNamespaceRule)) } - let prefix = input.r#try(|i| i.expect_ident_cloned()) + let prefix = input.try(|i| i.expect_ident_cloned()) .map(|s| Prefix::from(s.as_ref())).ok(); let maybe_namespace = match input.expect_url_or_string() { Ok(url_or_string) => url_or_string, diff --git a/components/style/stylesheets/supports_rule.rs b/components/style/stylesheets/supports_rule.rs index 10033d324a4..bc49b95238b 100644 --- a/components/style/stylesheets/supports_rule.rs +++ b/components/style/stylesheets/supports_rule.rs @@ -103,7 +103,7 @@ impl SupportsCondition { /// /// pub fn parse<'i, 't>(input: &mut Parser<'i, 't>) -> Result> { - if input.r#try(|i| i.expect_ident_matching("not")).is_ok() { + if input.try(|i| i.expect_ident_matching("not")).is_ok() { let inner = SupportsCondition::parse_in_parens(input)?; return Ok(SupportsCondition::Not(Box::new(inner))); } @@ -129,7 +129,7 @@ impl SupportsCondition { loop { conditions.push(SupportsCondition::parse_in_parens(input)?); if input - .r#try(|input| input.expect_ident_matching(keyword)) + .try(|input| input.expect_ident_matching(keyword)) .is_err() { // Did not find the expected keyword. @@ -175,20 +175,20 @@ impl SupportsCondition { fn parse_in_parens<'i, 't>(input: &mut Parser<'i, 't>) -> Result> { // Whitespace is normally taken care of in `Parser::next`, // but we want to not include it in `pos` for the SupportsCondition::FutureSyntax cases. - while input.r#try(Parser::expect_whitespace).is_ok() {} + while input.try(Parser::expect_whitespace).is_ok() {} let pos = input.position(); let location = input.current_source_location(); // FIXME: remove clone() when lifetimes are non-lexical match input.next()?.clone() { Token::ParenthesisBlock => { let nested = - input.r#try(|input| input.parse_nested_block(parse_condition_or_declaration)); + input.try(|input| input.parse_nested_block(parse_condition_or_declaration)); if nested.is_ok() { return nested; } }, Token::Function(ident) => { - let nested = input.r#try(|input| { + let nested = input.try(|input| { input.parse_nested_block(|input| { SupportsCondition::parse_functional(&ident, input) }) @@ -240,7 +240,7 @@ fn eval_moz_bool_pref(_: &CStr, _: &ParserContext) -> bool { pub fn parse_condition_or_declaration<'i, 't>( input: &mut Parser<'i, 't>, ) -> Result> { - if let Ok(condition) = input.r#try(SupportsCondition::parse) { + if let Ok(condition) = input.try(SupportsCondition::parse) { Ok(SupportsCondition::Parenthesized(Box::new(condition))) } else { Declaration::parse(input).map(SupportsCondition::Declaration) @@ -418,7 +418,7 @@ impl Declaration { PropertyDeclaration::parse_into(&mut declarations, id, &context, input) .map_err(|_| input.new_custom_error(())) })?; - let _ = input.r#try(parse_important); + let _ = input.try(parse_important); Ok(()) }) .is_ok() diff --git a/components/style/stylesheets/viewport_rule.rs b/components/style/stylesheets/viewport_rule.rs index de2fd55fb7b..ef2d58ecf0d 100644 --- a/components/style/stylesheets/viewport_rule.rs +++ b/components/style/stylesheets/viewport_rule.rs @@ -265,7 +265,7 @@ fn parse_shorthand<'i, 't>( input: &mut Parser<'i, 't>, ) -> Result<(ViewportLength, ViewportLength), ParseError<'i>> { let min = ViewportLength::parse(context, input)?; - match input.r#try(|i| ViewportLength::parse(context, i)) { + match input.try(|i| ViewportLength::parse(context, i)) { Err(_) => Ok((min.clone(), min)), Ok(max) => Ok((min, max)), } @@ -289,8 +289,8 @@ impl<'a, 'b, 'i> DeclarationParser<'i> for ViewportRuleParser<'a, 'b> { ) -> Result, ParseError<'i>> { macro_rules! declaration { ($declaration:ident($parse:expr)) => { - declaration!($declaration(value: r#try!($parse(input)), - important: input.r#try(parse_important).is_ok())) + declaration!($declaration(value: try!($parse(input)), + important: input.try(parse_important).is_ok())) }; ($declaration:ident(value: $value:expr, important: $important:expr)) => { ViewportDescriptorDeclaration::new( @@ -306,7 +306,7 @@ impl<'a, 'b, 'i> DeclarationParser<'i> for ViewportRuleParser<'a, 'b> { }; (shorthand -> [$min:ident, $max:ident]) => {{ let shorthand = parse_shorthand(self.context, input)?; - let important = input.r#try(parse_important).is_ok(); + let important = input.try(parse_important).is_ok(); Ok(vec![ declaration!($min(value: shorthand.0, important: important)), diff --git a/components/style/values/computed/font.rs b/components/style/values/computed/font.rs index a60eb82f0d2..ec3305be277 100644 --- a/components/style/values/computed/font.rs +++ b/components/style/values/computed/font.rs @@ -374,7 +374,7 @@ impl SingleFontFamily { /// Parse a font-family value pub fn parse<'i, 't>(input: &mut Parser<'i, 't>) -> Result> { - if let Ok(value) = input.r#try(|i| i.expect_string_cloned()) { + if let Ok(value) = input.try(|i| i.expect_string_cloned()) { return Ok(SingleFontFamily::FamilyName(FamilyName { name: Atom::from(&*value), syntax: FamilyNameSyntax::Quoted, @@ -419,7 +419,7 @@ impl SingleFontFamily { value.push(' '); value.push_str(&ident); } - while let Ok(ident) = input.r#try(|i| i.expect_ident_cloned()) { + while let Ok(ident) = input.try(|i| i.expect_ident_cloned()) { value.push(' '); value.push_str(&ident); } diff --git a/components/style/values/generics/font.rs b/components/style/values/generics/font.rs index 204de699db3..7f62b15dd3c 100644 --- a/components/style/values/generics/font.rs +++ b/components/style/values/generics/font.rs @@ -85,7 +85,7 @@ impl Parse for FontSettings { context: &ParserContext, input: &mut Parser<'i, 't>, ) -> Result> { - if input.r#try(|i| i.expect_ident_matching("normal")).is_ok() { + if input.try(|i| i.expect_ident_matching("normal")).is_ok() { return Ok(Self::normal()); } diff --git a/components/style/values/generics/grid.rs b/components/style/values/generics/grid.rs index c565ca6c320..8a26cbd2b16 100644 --- a/components/style/values/generics/grid.rs +++ b/components/style/values/generics/grid.rs @@ -86,7 +86,7 @@ impl Parse for GridLine { input: &mut Parser<'i, 't>, ) -> Result> { let mut grid_line = Self::auto(); - if input.r#try(|i| i.expect_ident_matching("auto")).is_ok() { + if input.try(|i| i.expect_ident_matching("auto")).is_ok() { return Ok(grid_line); } @@ -99,7 +99,7 @@ impl Parse for GridLine { for _ in 0..3 { // Maximum possible entities for let location = input.current_source_location(); - if input.r#try(|i| i.expect_ident_matching("span")).is_ok() { + if input.try(|i| i.expect_ident_matching("span")).is_ok() { if grid_line.is_span { return Err(location.new_custom_error(StyleParseErrorKind::UnspecifiedError)); } @@ -109,14 +109,14 @@ impl Parse for GridLine { } grid_line.is_span = true; - } else if let Ok(i) = input.r#try(|i| specified::Integer::parse(context, i)) { + } else if let Ok(i) = input.try(|i| specified::Integer::parse(context, i)) { // FIXME(emilio): Probably shouldn't reject if it's calc()... if i.value() == 0 || val_before_span || grid_line.line_num.is_some() { return Err(location.new_custom_error(StyleParseErrorKind::UnspecifiedError)); } grid_line.line_num = Some(i); - } else if let Ok(name) = input.r#try(|i| i.expect_ident_cloned()) { + } else if let Ok(name) = input.try(|i| i.expect_ident_cloned()) { if val_before_span || grid_line.ident.is_some() { return Err(location.new_custom_error(StyleParseErrorKind::UnspecifiedError)); } @@ -375,7 +375,7 @@ impl Parse for RepeatCount { ) -> Result> { // Maximum number of repeat is 10000. The greater numbers should be clamped. const MAX_LINE: i32 = 10000; - if let Ok(mut i) = input.r#try(|i| specified::Integer::parse_positive(context, i)) { + if let Ok(mut i) = input.try(|i| specified::Integer::parse_positive(context, i)) { if i.value() > MAX_LINE { i = specified::Integer::new(MAX_LINE); } @@ -605,14 +605,14 @@ impl Parse for LineNameList { let mut fill_idx = None; loop { - let repeat_parse_result = input.r#try(|input| { + let repeat_parse_result = input.try(|input| { input.expect_function_matching("repeat")?; input.parse_nested_block(|input| { let count = RepeatCount::parse(context, input)?; input.expect_comma()?; let mut names_list = vec![]; names_list.push(parse_line_names(input)?); // there should be at least one - while let Ok(names) = input.r#try(parse_line_names) { + while let Ok(names) = input.try(parse_line_names) { names_list.push(names); } @@ -643,7 +643,7 @@ impl Parse for LineNameList { }, _ => return Err(input.new_custom_error(StyleParseErrorKind::UnspecifiedError)), } - } else if let Ok(names) = input.r#try(parse_line_names) { + } else if let Ok(names) = input.try(parse_line_names) { line_names.push(names); } else { break; diff --git a/components/style/values/generics/mod.rs b/components/style/values/generics/mod.rs index f1c5acd602e..862ebef459f 100644 --- a/components/style/values/generics/mod.rs +++ b/components/style/values/generics/mod.rs @@ -111,19 +111,16 @@ impl Parse for CounterStyleOrNone { context: &ParserContext, input: &mut Parser<'i, 't>, ) -> Result> { - if let Ok(name) = input.r#try(|i| parse_counter_style_name(i)) { + if let Ok(name) = input.try(|i| parse_counter_style_name(i)) { return Ok(CounterStyleOrNone::Name(name)); } - if input.r#try(|i| i.expect_ident_matching("none")).is_ok() { + if input.try(|i| i.expect_ident_matching("none")).is_ok() { return Ok(CounterStyleOrNone::None); } - if input - .r#try(|i| i.expect_function_matching("symbols")) - .is_ok() - { + if input.try(|i| i.expect_function_matching("symbols")).is_ok() { return input.parse_nested_block(|input| { let symbols_type = input - .r#try(|i| SymbolsType::parse(i)) + .try(|i| SymbolsType::parse(i)) .unwrap_or(SymbolsType::Symbolic); let symbols = Symbols::parse(context, input)?; // There must be at least two symbols for alphabetic or diff --git a/components/style/values/generics/rect.rs b/components/style/values/generics/rect.rs index 6ba11570dfe..fa5caab3e4b 100644 --- a/components/style/values/generics/rect.rs +++ b/components/style/values/generics/rect.rs @@ -50,7 +50,7 @@ where Parse: Fn(&ParserContext, &mut Parser<'i, 't>) -> Result>, { let first = parse(context, input)?; - let second = if let Ok(second) = input.r#try(|i| parse(context, i)) { + let second = if let Ok(second) = input.try(|i| parse(context, i)) { second } else { // @@ -61,13 +61,13 @@ where first, )); }; - let third = if let Ok(third) = input.r#try(|i| parse(context, i)) { + let third = if let Ok(third) = input.try(|i| parse(context, i)) { third } else { // return Ok(Self::new(first.clone(), second.clone(), first, second)); }; - let fourth = if let Ok(fourth) = input.r#try(|i| parse(context, i)) { + let fourth = if let Ok(fourth) = input.try(|i| parse(context, i)) { fourth } else { // diff --git a/components/style/values/generics/size.rs b/components/style/values/generics/size.rs index 24fba15d59c..7271aaa3922 100644 --- a/components/style/values/generics/size.rs +++ b/components/style/values/generics/size.rs @@ -55,7 +55,7 @@ impl Size { { let first = parse_one(context, input)?; let second = input - .r#try(|i| parse_one(context, i)) + .try(|i| parse_one(context, i)) .unwrap_or_else(|_| first.clone()); Ok(Self::new(first, second)) } diff --git a/components/style/values/generics/svg.rs b/components/style/values/generics/svg.rs index cdbca333441..1b439657def 100644 --- a/components/style/values/generics/svg.rs +++ b/components/style/values/generics/svg.rs @@ -84,10 +84,10 @@ fn parse_fallback<'i, 't, ColorType: Parse>( context: &ParserContext, input: &mut Parser<'i, 't>, ) -> Option> { - if input.r#try(|i| i.expect_ident_matching("none")).is_ok() { + if input.try(|i| i.expect_ident_matching("none")).is_ok() { Some(Either::Second(None_)) } else { - if let Ok(color) = input.r#try(|i| ColorType::parse(context, i)) { + if let Ok(color) = input.try(|i| ColorType::parse(context, i)) { Some(Either::First(color)) } else { None @@ -100,12 +100,12 @@ impl Parse for SVGPaint, ) -> Result> { - if let Ok(url) = input.r#try(|i| UrlPaintServer::parse(context, i)) { + if let Ok(url) = input.try(|i| UrlPaintServer::parse(context, i)) { Ok(SVGPaint { kind: SVGPaintKind::PaintServer(url), fallback: parse_fallback(context, input), }) - } else if let Ok(kind) = input.r#try(SVGPaintKind::parse_ident) { + } else if let Ok(kind) = input.try(SVGPaintKind::parse_ident) { if let SVGPaintKind::None = kind { Ok(SVGPaint { kind: kind, @@ -117,7 +117,7 @@ impl Parse for SVGPaint Parse context: &ParserContext, input: &mut Parser<'i, 't>, ) -> Result> { - if let Ok(num) = input.r#try(|i| NumberType::parse(context, i)) { + if let Ok(num) = input.try(|i| NumberType::parse(context, i)) { return Ok(SvgLengthOrPercentageOrNumber::Number(num)); } diff --git a/components/style/values/generics/text.rs b/components/style/values/generics/text.rs index 0be499c6933..ccd5c192270 100644 --- a/components/style/values/generics/text.rs +++ b/components/style/values/generics/text.rs @@ -58,7 +58,7 @@ impl Spacing { where F: FnOnce(&ParserContext, &mut Parser<'i, 't>) -> Result>, { - if input.r#try(|i| i.expect_ident_matching("normal")).is_ok() { + if input.try(|i| i.expect_ident_matching("normal")).is_ok() { return Ok(Spacing::Normal); } parse(context, input).map(Spacing::Value) diff --git a/components/style/values/generics/url.rs b/components/style/values/generics/url.rs index ccd50b235b9..51ad8055be1 100644 --- a/components/style/values/generics/url.rs +++ b/components/style/values/generics/url.rs @@ -44,7 +44,7 @@ where context: &ParserContext, input: &mut Parser<'i, 't>, ) -> Result, ParseError<'i>> { - if let Ok(url) = input.r#try(|input| Url::parse(context, input)) { + if let Ok(url) = input.try(|input| Url::parse(context, input)) { return Ok(UrlOrNone::Url(url)); } input.expect_ident_matching("none")?; diff --git a/components/style/values/mod.rs b/components/style/values/mod.rs index 9b78be371d3..a03875b96a8 100644 --- a/components/style/values/mod.rs +++ b/components/style/values/mod.rs @@ -155,7 +155,7 @@ impl Parse for Either { context: &ParserContext, input: &mut Parser<'i, 't>, ) -> Result, ParseError<'i>> { - if let Ok(v) = input.r#try(|i| A::parse(context, i)) { + if let Ok(v) = input.try(|i| A::parse(context, i)) { Ok(Either::First(v)) } else { B::parse(context, input).map(Either::Second) diff --git a/components/style/values/specified/align.rs b/components/style/values/specified/align.rs index 9e8fa8ecd40..8ab097c45bf 100644 --- a/components/style/values/specified/align.rs +++ b/components/style/values/specified/align.rs @@ -195,25 +195,25 @@ impl ContentDistribution { // when this function is updated. // Try to parse normal first - if input.r#try(|i| i.expect_ident_matching("normal")).is_ok() { + if input.try(|i| i.expect_ident_matching("normal")).is_ok() { return Ok(ContentDistribution::normal()); } // Parse , but only on the block axis. if axis == AxisDirection::Block { - if let Ok(value) = input.r#try(parse_baseline) { + if let Ok(value) = input.try(parse_baseline) { return Ok(ContentDistribution::new(value)); } } // - if let Ok(value) = input.r#try(parse_content_distribution) { + if let Ok(value) = input.try(parse_content_distribution) { return Ok(ContentDistribution::new(value)); } // ? let overflow_position = input - .r#try(parse_overflow_position) + .try(parse_overflow_position) .unwrap_or(AlignFlags::empty()); let content_position = try_match_ident_ignore_ascii_case! { input, @@ -358,18 +358,18 @@ impl SelfAlignment { // // It's weird that this accepts , but not // justify-content... - if let Ok(value) = input.r#try(parse_baseline) { + if let Ok(value) = input.try(parse_baseline) { return Ok(SelfAlignment(value)); } // auto | normal | stretch - if let Ok(value) = input.r#try(parse_auto_normal_stretch) { + if let Ok(value) = input.try(parse_auto_normal_stretch) { return Ok(SelfAlignment(value)); } // ? let overflow_position = input - .r#try(parse_overflow_position) + .try(parse_overflow_position) .unwrap_or(AlignFlags::empty()); let self_position = parse_self_position(input, axis)?; Ok(SelfAlignment(overflow_position | self_position)) @@ -484,17 +484,17 @@ impl Parse for AlignItems { // this function is updated. // - if let Ok(baseline) = input.r#try(parse_baseline) { + if let Ok(baseline) = input.try(parse_baseline) { return Ok(AlignItems(baseline)); } // normal | stretch - if let Ok(value) = input.r#try(parse_normal_stretch) { + if let Ok(value) = input.try(parse_normal_stretch) { return Ok(AlignItems(value)); } // ? let overflow = input - .r#try(parse_overflow_position) + .try(parse_overflow_position) .unwrap_or(AlignFlags::empty()); let self_position = parse_self_position(input, AxisDirection::Block)?; Ok(AlignItems(self_position | overflow)) @@ -542,23 +542,23 @@ impl Parse for JustifyItems { // // It's weird that this accepts , but not // justify-content... - if let Ok(baseline) = input.r#try(parse_baseline) { + if let Ok(baseline) = input.try(parse_baseline) { return Ok(JustifyItems(baseline)); } // normal | stretch - if let Ok(value) = input.r#try(parse_normal_stretch) { + if let Ok(value) = input.try(parse_normal_stretch) { return Ok(JustifyItems(value)); } // legacy | [ legacy && [ left | right | center ] ] - if let Ok(value) = input.r#try(parse_legacy) { + if let Ok(value) = input.try(parse_legacy) { return Ok(JustifyItems(value)); } // ? let overflow = input - .r#try(parse_overflow_position) + .try(parse_overflow_position) .unwrap_or(AlignFlags::empty()); let self_position = parse_self_position(input, AxisDirection::Inline)?; Ok(JustifyItems(overflow | self_position)) @@ -714,7 +714,7 @@ fn parse_legacy<'i, 't>(input: &mut Parser<'i, 't>) -> Result { - let flags = input.r#try(parse_left_right_center) + let flags = input.try(parse_left_right_center) .unwrap_or(AlignFlags::empty()); return Ok(AlignFlags::LEGACY | flags) diff --git a/components/style/values/specified/background.rs b/components/style/values/specified/background.rs index 29e1812dbbc..9aa47fb522c 100644 --- a/components/style/values/specified/background.rs +++ b/components/style/values/specified/background.rs @@ -19,9 +19,9 @@ impl Parse for BackgroundSize { context: &ParserContext, input: &mut Parser<'i, 't>, ) -> Result> { - if let Ok(width) = input.r#try(|i| NonNegativeLengthOrPercentageOrAuto::parse(context, i)) { + if let Ok(width) = input.try(|i| NonNegativeLengthOrPercentageOrAuto::parse(context, i)) { let height = input - .r#try(|i| NonNegativeLengthOrPercentageOrAuto::parse(context, i)) + .try(|i| NonNegativeLengthOrPercentageOrAuto::parse(context, i)) .unwrap_or(NonNegativeLengthOrPercentageOrAuto::auto()); return Ok(GenericBackgroundSize::Explicit { width, height }); } @@ -106,7 +106,7 @@ impl Parse for BackgroundRepeat { }, }; - let vertical = input.r#try(BackgroundRepeatKeyword::parse).ok(); + let vertical = input.try(BackgroundRepeatKeyword::parse).ok(); Ok(BackgroundRepeat::Keywords(horizontal, vertical)) } } diff --git a/components/style/values/specified/basic_shape.rs b/components/style/values/specified/basic_shape.rs index 0631c7f0a7d..d394d8881dd 100644 --- a/components/style/values/specified/basic_shape.rs +++ b/components/style/values/specified/basic_shape.rs @@ -70,12 +70,12 @@ impl Parse for ClippingShape { input: &mut Parser<'i, 't>, ) -> Result> { if is_clip_path_path_enabled(context) { - if let Ok(p) = input.r#try(|i| Path::parse(context, i)) { + if let Ok(p) = input.try(|i| Path::parse(context, i)) { return Ok(ShapeSource::Path(p)); } } - if let Ok(url) = input.r#try(|i| SpecifiedUrl::parse(context, i)) { + if let Ok(url) = input.try(|i| SpecifiedUrl::parse(context, i)) { return Ok(ShapeSource::ImageOrUrl(url)); } @@ -89,7 +89,7 @@ impl Parse for FloatAreaShape { context: &ParserContext, input: &mut Parser<'i, 't>, ) -> Result> { - if let Ok(image) = input.r#try(|i| Image::parse_with_cors_anonymous(context, i)) { + if let Ok(image) = input.try(|i| Image::parse_with_cors_anonymous(context, i)) { return Ok(ShapeSource::ImageOrUrl(image)); } @@ -106,7 +106,7 @@ where context: &ParserContext, input: &mut Parser<'i, 't>, ) -> Result> { - if input.r#try(|i| i.expect_ident_matching("none")).is_ok() { + if input.try(|i| i.expect_ident_matching("none")).is_ok() { return Ok(ShapeSource::None); } @@ -119,7 +119,7 @@ where return false; // already parsed this component } - *component = input.r#try(|i| U::parse(context, i)).ok(); + *component = input.try(|i| U::parse(context, i)).ok(); component.is_some() } @@ -147,7 +147,7 @@ impl Parse for GeometryBox { _context: &ParserContext, input: &mut Parser<'i, 't>, ) -> Result> { - if let Ok(shape_box) = input.r#try(|i| ShapeBox::parse(i)) { + if let Ok(shape_box) = input.try(|i| ShapeBox::parse(i)) { return Ok(GeometryBox::ShapeBox(shape_box)); } @@ -197,7 +197,7 @@ impl InsetRect { input: &mut Parser<'i, 't>, ) -> Result> { let rect = Rect::parse_with(context, input, LengthOrPercentage::parse)?; - let round = if input.r#try(|i| i.expect_ident_matching("round")).is_ok() { + let round = if input.try(|i| i.expect_ident_matching("round")).is_ok() { Some(BorderRadius::parse(context, input)?) } else { None @@ -225,9 +225,9 @@ impl Circle { input: &mut Parser<'i, 't>, ) -> Result> { let radius = input - .r#try(|i| ShapeRadius::parse(context, i)) + .try(|i| ShapeRadius::parse(context, i)) .unwrap_or_default(); - let position = if input.r#try(|i| i.expect_ident_matching("at")).is_ok() { + let position = if input.try(|i| i.expect_ident_matching("at")).is_ok() { Position::parse(context, input)? } else { Position::center() @@ -270,14 +270,14 @@ impl Ellipse { input: &mut Parser<'i, 't>, ) -> Result> { let (a, b) = input - .r#try(|i| -> Result<_, ParseError> { + .try(|i| -> Result<_, ParseError> { Ok(( ShapeRadius::parse(context, i)?, ShapeRadius::parse(context, i)?, )) }) .unwrap_or_default(); - let position = if input.r#try(|i| i.expect_ident_matching("at")).is_ok() { + let position = if input.try(|i| i.expect_ident_matching("at")).is_ok() { Position::parse(context, input)? } else { Position::center() @@ -315,7 +315,7 @@ impl Parse for ShapeRadius { context: &ParserContext, input: &mut Parser<'i, 't>, ) -> Result> { - if let Ok(lop) = input.r#try(|i| LengthOrPercentage::parse_non_negative(context, i)) { + if let Ok(lop) = input.try(|i| LengthOrPercentage::parse_non_negative(context, i)) { return Ok(generic::ShapeRadius::Length(lop)); } @@ -419,7 +419,7 @@ impl Polygon { input: &mut Parser<'i, 't>, ) -> Result> { let fill = input - .r#try(|i| -> Result<_, ParseError> { + .try(|i| -> Result<_, ParseError> { let fill = FillRule::parse(i)?; i.expect_comma()?; // only eat the comma if there is something before it Ok(fill) @@ -457,7 +457,7 @@ impl Path { input: &mut Parser<'i, 't>, ) -> Result> { let fill = input - .r#try(|i| -> Result<_, ParseError> { + .try(|i| -> Result<_, ParseError> { let fill = FillRule::parse(i)?; i.expect_comma()?; Ok(fill) diff --git a/components/style/values/specified/border.rs b/components/style/values/specified/border.rs index 27b9355c21d..c64e5c99985 100644 --- a/components/style/values/specified/border.rs +++ b/components/style/values/specified/border.rs @@ -58,7 +58,7 @@ impl BorderSideWidth { allow_quirks: AllowQuirks, ) -> Result> { if let Ok(length) = - input.r#try(|i| Length::parse_non_negative_quirky(context, i, allow_quirks)) + input.try(|i| Length::parse_non_negative_quirky(context, i, allow_quirks)) { return Ok(BorderSideWidth::Length(length)); } @@ -115,11 +115,11 @@ impl Parse for BorderImageSideWidth { context: &ParserContext, input: &mut Parser<'i, 't>, ) -> Result> { - if input.r#try(|i| i.expect_ident_matching("auto")).is_ok() { + if input.try(|i| i.expect_ident_matching("auto")).is_ok() { return Ok(GenericBorderImageSideWidth::Auto); } - if let Ok(len) = input.r#try(|i| LengthOrPercentage::parse_non_negative(context, i)) { + if let Ok(len) = input.try(|i| LengthOrPercentage::parse_non_negative(context, i)) { return Ok(GenericBorderImageSideWidth::Length(len)); } @@ -133,10 +133,10 @@ impl Parse for BorderImageSlice { context: &ParserContext, input: &mut Parser<'i, 't>, ) -> Result> { - let mut fill = input.r#try(|i| i.expect_ident_matching("fill")).is_ok(); + let mut fill = input.try(|i| i.expect_ident_matching("fill")).is_ok(); let offsets = Rect::parse_with(context, input, NumberOrPercentage::parse_non_negative)?; if !fill { - fill = input.r#try(|i| i.expect_ident_matching("fill")).is_ok(); + fill = input.try(|i| i.expect_ident_matching("fill")).is_ok(); } Ok(GenericBorderImageSlice { offsets: offsets, @@ -151,7 +151,7 @@ impl Parse for BorderRadius { input: &mut Parser<'i, 't>, ) -> Result> { let widths = Rect::parse_with(context, input, LengthOrPercentage::parse_non_negative)?; - let heights = if input.r#try(|i| i.expect_delim('/')).is_ok() { + let heights = if input.try(|i| i.expect_delim('/')).is_ok() { Rect::parse_with(context, input, LengthOrPercentage::parse_non_negative)? } else { widths.clone() @@ -236,7 +236,7 @@ impl Parse for BorderImageRepeat { input: &mut Parser<'i, 't>, ) -> Result> { let horizontal = BorderImageRepeatKeyword::parse(input)?; - let vertical = input.r#try(BorderImageRepeatKeyword::parse).ok(); + let vertical = input.try(BorderImageRepeatKeyword::parse).ok(); Ok(BorderImageRepeat( horizontal, vertical.unwrap_or(horizontal), diff --git a/components/style/values/specified/box.rs b/components/style/values/specified/box.rs index da7b5d98eee..d39aa547476 100644 --- a/components/style/values/specified/box.rs +++ b/components/style/values/specified/box.rs @@ -310,7 +310,7 @@ impl Parse for VerticalAlign { input: &mut Parser<'i, 't>, ) -> Result> { if let Ok(lop) = - input.r#try(|i| LengthOrPercentage::parse_quirky(context, i, AllowQuirks::Yes)) + input.try(|i| LengthOrPercentage::parse_quirky(context, i, AllowQuirks::Yes)) { return Ok(GenericVerticalAlign::Length(lop)); } @@ -341,7 +341,7 @@ impl Parse for AnimationIterationCount { input: &mut ::cssparser::Parser<'i, 't>, ) -> Result> { if input - .r#try(|input| input.expect_ident_matching("infinite")) + .try(|input| input.expect_ident_matching("infinite")) .is_ok() { return Ok(GenericAnimationIterationCount::Infinite); @@ -394,7 +394,7 @@ impl Parse for AnimationName { context: &ParserContext, input: &mut Parser<'i, 't>, ) -> Result> { - if let Ok(name) = input.r#try(|input| KeyframesName::parse(context, input)) { + if let Ok(name) = input.try(|input| KeyframesName::parse(context, input)) { return Ok(AnimationName(Some(name))); } @@ -557,7 +557,7 @@ impl Parse for WillChange { input: &mut Parser<'i, 't>, ) -> Result> { if input - .r#try(|input| input.expect_ident_matching("auto")) + .try(|input| input.expect_ident_matching("auto")) .is_ok() { return Ok(WillChange::Auto); @@ -646,14 +646,14 @@ impl Parse for TouchAction { "none" => Ok(TouchAction::TOUCH_ACTION_NONE), "manipulation" => Ok(TouchAction::TOUCH_ACTION_MANIPULATION), "pan-x" => { - if input.r#try(|i| i.expect_ident_matching("pan-y")).is_ok() { + if input.try(|i| i.expect_ident_matching("pan-y")).is_ok() { Ok(TouchAction::TOUCH_ACTION_PAN_X | TouchAction::TOUCH_ACTION_PAN_Y) } else { Ok(TouchAction::TOUCH_ACTION_PAN_X) } }, "pan-y" => { - if input.r#try(|i| i.expect_ident_matching("pan-x")).is_ok() { + if input.try(|i| i.expect_ident_matching("pan-x")).is_ok() { Ok(TouchAction::TOUCH_ACTION_PAN_X | TouchAction::TOUCH_ACTION_PAN_Y) } else { Ok(TouchAction::TOUCH_ACTION_PAN_Y) @@ -757,7 +757,7 @@ impl Parse for Contain { input: &mut Parser<'i, 't>, ) -> Result> { let mut result = Contain::empty(); - while let Ok(name) = input.r#try(|i| i.expect_ident_cloned()) { + while let Ok(name) = input.try(|i| i.expect_ident_cloned()) { let flag = match_ignore_ascii_case! { &name, "size" => Some(Contain::SIZE), "layout" => Some(Contain::LAYOUT), @@ -794,7 +794,7 @@ impl Parse for Perspective { context: &ParserContext, input: &mut Parser<'i, 't>, ) -> Result> { - if input.r#try(|i| i.expect_ident_matching("none")).is_ok() { + if input.try(|i| i.expect_ident_matching("none")).is_ok() { return Ok(GenericPerspective::None); } Ok(GenericPerspective::Length(NonNegativeLength::parse( diff --git a/components/style/values/specified/color.rs b/components/style/values/specified/color.rs index ab24d1a157c..a0f3c3bbde4 100644 --- a/components/style/values/specified/color.rs +++ b/components/style/values/specified/color.rs @@ -142,7 +142,7 @@ impl Parse for Color { input.reset(&start); let compontent_parser = ColorComponentParser(&*context); - match input.r#try(|i| CSSParserColor::parse_with(&compontent_parser, i)) { + match input.try(|i| CSSParserColor::parse_with(&compontent_parser, i)) { Ok(value) => Ok(match value { CSSParserColor::CurrentColor => Color::CurrentColor, CSSParserColor::RGBA(rgba) => Color::Numeric { @@ -245,7 +245,7 @@ impl Color { input: &mut Parser<'i, 't>, allow_quirks: AllowQuirks, ) -> Result> { - input.r#try(|i| Self::parse(context, i)).or_else(|e| { + input.try(|i| Self::parse(context, i)).or_else(|e| { if !allow_quirks.allowed(context.quirks_mode) { return Err(e); } diff --git a/components/style/values/specified/column.rs b/components/style/values/specified/column.rs index 2b6a919b232..0a77dd24687 100644 --- a/components/style/values/specified/column.rs +++ b/components/style/values/specified/column.rs @@ -18,7 +18,7 @@ impl Parse for ColumnCount { context: &ParserContext, input: &mut Parser<'i, 't>, ) -> Result> { - if input.r#try(|i| i.expect_ident_matching("auto")).is_ok() { + if input.try(|i| i.expect_ident_matching("auto")).is_ok() { return Ok(GenericColumnCount::Auto); } Ok(GenericColumnCount::Integer(PositiveInteger::parse( diff --git a/components/style/values/specified/counters.rs b/components/style/values/specified/counters.rs index 718dd07a5fb..fb2b64dbc86 100644 --- a/components/style/values/specified/counters.rs +++ b/components/style/values/specified/counters.rs @@ -52,7 +52,7 @@ fn parse_counters<'i, 't>( default_value: i32, ) -> Result>, ParseError<'i>> { if input - .r#try(|input| input.expect_ident_matching("none")) + .try(|input| input.expect_ident_matching("none")) .is_ok() { return Ok(vec![]); @@ -68,7 +68,7 @@ fn parse_counters<'i, 't>( }; let value = input - .r#try(|input| Integer::parse(context, input)) + .try(|input| Integer::parse(context, input)) .unwrap_or(Integer::new(default_value)); counters.push(CounterPair { name, value }); } @@ -90,7 +90,7 @@ impl Content { #[cfg(feature = "servo")] fn parse_counter_style(_: &ParserContext, input: &mut Parser) -> ListStyleType { input - .r#try(|input| { + .try(|input| { input.expect_comma()?; ListStyleType::parse(input) }) @@ -100,7 +100,7 @@ impl Content { #[cfg(feature = "gecko")] fn parse_counter_style(context: &ParserContext, input: &mut Parser) -> CounterStyleOrNone { input - .r#try(|input| { + .try(|input| { input.expect_comma()?; CounterStyleOrNone::parse(context, input) }) @@ -117,13 +117,13 @@ impl Parse for Content { input: &mut Parser<'i, 't>, ) -> Result> { if input - .r#try(|input| input.expect_ident_matching("normal")) + .try(|input| input.expect_ident_matching("normal")) .is_ok() { return Ok(generics::Content::Normal); } if input - .r#try(|input| input.expect_ident_matching("none")) + .try(|input| input.expect_ident_matching("none")) .is_ok() { return Ok(generics::Content::None); @@ -131,7 +131,7 @@ impl Parse for Content { #[cfg(feature = "gecko")] { if input - .r#try(|input| input.expect_ident_matching("-moz-alt-content")) + .try(|input| input.expect_ident_matching("-moz-alt-content")) .is_ok() { return Ok(generics::Content::MozAltContent); @@ -142,7 +142,7 @@ impl Parse for Content { loop { #[cfg(feature = "gecko")] { - if let Ok(url) = input.r#try(|i| SpecifiedImageUrl::parse(context, i)) { + if let Ok(url) = input.try(|i| SpecifiedImageUrl::parse(context, i)) { content.push(generics::ContentItem::Url(url)); continue; } diff --git a/components/style/values/specified/easing.rs b/components/style/values/specified/easing.rs index d65f1897d4c..f7cd72a3747 100644 --- a/components/style/values/specified/easing.rs +++ b/components/style/values/specified/easing.rs @@ -21,10 +21,10 @@ impl Parse for TimingFunction { context: &ParserContext, input: &mut Parser<'i, 't>, ) -> Result> { - if let Ok(keyword) = input.r#try(TimingKeyword::parse) { + if let Ok(keyword) = input.try(TimingKeyword::parse) { return Ok(GenericTimingFunction::Keyword(keyword)); } - if let Ok(ident) = input.r#try(|i| i.expect_ident_cloned()) { + if let Ok(ident) = input.try(|i| i.expect_ident_cloned()) { let position = match_ignore_ascii_case! { &ident, "step-start" => StepPosition::Start, "step-end" => StepPosition::End, @@ -57,7 +57,7 @@ impl Parse for TimingFunction { }, "steps" => { let steps = Integer::parse_positive(context, i)?; - let position = i.r#try(|i| { + let position = i.try(|i| { i.expect_comma()?; StepPosition::parse(context, i) }).unwrap_or(StepPosition::End); diff --git a/components/style/values/specified/effects.rs b/components/style/values/specified/effects.rs index 758827ae5ec..6a6612e7a94 100644 --- a/components/style/values/specified/effects.rs +++ b/components/style/values/specified/effects.rs @@ -109,7 +109,7 @@ impl Parse for BoxShadow { loop { if !inset { if input - .r#try(|input| input.expect_ident_matching("inset")) + .try(|input| input.expect_ident_matching("inset")) .is_ok() { inset = true; @@ -117,14 +117,14 @@ impl Parse for BoxShadow { } } if lengths.is_none() { - let value = input.r#try::<_, _, ParseError>(|i| { + let value = input.try::<_, _, ParseError>(|i| { let horizontal = Length::parse(context, i)?; let vertical = Length::parse(context, i)?; let (blur, spread) = match i - .r#try::<_, _, ParseError>(|i| Length::parse_non_negative(context, i)) + .try::<_, _, ParseError>(|i| Length::parse_non_negative(context, i)) { Ok(blur) => { - let spread = i.r#try(|i| Length::parse(context, i)).ok(); + let spread = i.try(|i| Length::parse(context, i)).ok(); (Some(blur.into()), spread) }, Err(_) => (None, None), @@ -137,7 +137,7 @@ impl Parse for BoxShadow { } } if color.is_none() { - if let Ok(value) = input.r#try(|i| Color::parse(context, i)) { + if let Ok(value) = input.try(|i| Color::parse(context, i)) { color = Some(value); continue; } @@ -194,7 +194,7 @@ impl Parse for Filter { ) -> Result> { #[cfg(feature = "gecko")] { - if let Ok(url) = input.r#try(|i| SpecifiedUrl::parse(context, i)) { + if let Ok(url) = input.try(|i| SpecifiedUrl::parse(context, i)) { return Ok(GenericFilter::Url(url)); } } @@ -253,12 +253,12 @@ impl Parse for SimpleShadow { context: &ParserContext, input: &mut Parser<'i, 't>, ) -> Result> { - let color = input.r#try(|i| Color::parse(context, i)).ok(); + let color = input.try(|i| Color::parse(context, i)).ok(); let horizontal = Length::parse(context, input)?; let vertical = Length::parse(context, input)?; - let blur = input.r#try(|i| Length::parse_non_negative(context, i)).ok(); + let blur = input.try(|i| Length::parse_non_negative(context, i)).ok(); let blur = blur.map(NonNegative::); - let color = color.or_else(|| input.r#try(|i| Color::parse(context, i)).ok()); + let color = color.or_else(|| input.try(|i| Color::parse(context, i)).ok()); Ok(SimpleShadow { color, diff --git a/components/style/values/specified/flex.rs b/components/style/values/specified/flex.rs index 8efe96ed556..01fbbb7f304 100644 --- a/components/style/values/specified/flex.rs +++ b/components/style/values/specified/flex.rs @@ -25,7 +25,7 @@ impl Parse for FlexBasis { context: &ParserContext, input: &mut Parser<'i, 't>, ) -> Result> { - if let Ok(width) = input.r#try(|i| Width::parse(context, i)) { + if let Ok(width) = input.try(|i| Width::parse(context, i)) { return Ok(GenericFlexBasis::Width(width)); } try_match_ident_ignore_ascii_case! { input, diff --git a/components/style/values/specified/font.rs b/components/style/values/specified/font.rs index eabb878f311..2c0651bac4b 100644 --- a/components/style/values/specified/font.rs +++ b/components/style/values/specified/font.rs @@ -117,7 +117,7 @@ impl Parse for FontWeight { context: &ParserContext, input: &mut Parser<'i, 't>, ) -> Result> { - if let Ok(absolute) = input.r#try(|input| AbsoluteFontWeight::parse(context, input)) { + if let Ok(absolute) = input.try(|input| AbsoluteFontWeight::parse(context, input)) { return Ok(FontWeight::Absolute(absolute)); } @@ -190,7 +190,7 @@ impl Parse for AbsoluteFontWeight { context: &ParserContext, input: &mut Parser<'i, 't>, ) -> Result> { - if let Ok(number) = input.r#try(|input| Number::parse(context, input)) { + if let Ok(number) = input.try(|input| Number::parse(context, input)) { // We could add another AllowedNumericType value, but it doesn't // seem worth it just for a single property with such a weird range, // so we do the clamping here manually. @@ -242,7 +242,7 @@ impl Parse for SpecifiedFontStyle { "normal" => generics::FontStyle::Normal, "italic" => generics::FontStyle::Italic, "oblique" => { - let angle = input.r#try(|input| Self::parse_angle(context, input)) + let angle = input.try(|input| Self::parse_angle(context, input)) .unwrap_or_else(|_| Self::default_angle()); generics::FontStyle::Oblique(angle) @@ -481,8 +481,7 @@ impl Parse for FontStretch { // // Values less than 0% are not allowed and are treated as parse // errors. - if let Ok(percentage) = input.r#try(|input| Percentage::parse_non_negative(context, input)) - { + if let Ok(percentage) = input.try(|input| Percentage::parse_non_negative(context, input)) { return Ok(FontStretch::Stretch(percentage)); } @@ -682,7 +681,7 @@ impl Parse for FontSizeAdjust { input: &mut Parser<'i, 't>, ) -> Result> { if input - .r#try(|input| input.expect_ident_matching("none")) + .try(|input| input.expect_ident_matching("none")) .is_ok() { return Ok(FontSizeAdjust::None); @@ -990,12 +989,12 @@ impl FontSize { allow_quirks: AllowQuirks, ) -> Result> { if let Ok(lop) = - input.r#try(|i| LengthOrPercentage::parse_non_negative_quirky(context, i, allow_quirks)) + input.try(|i| LengthOrPercentage::parse_non_negative_quirky(context, i, allow_quirks)) { return Ok(FontSize::Length(lop)); } - if let Ok(kw) = input.r#try(KeywordSize::parse) { + if let Ok(kw) = input.try(KeywordSize::parse) { return Ok(FontSize::Keyword(kw.into())); } @@ -1177,7 +1176,7 @@ impl Parse for FontVariantAlternates { ) -> Result> { let mut alternates = Vec::new(); if input - .r#try(|input| input.expect_ident_matching("normal")) + .try(|input| input.expect_ident_matching("normal")) .is_ok() { return Ok(FontVariantAlternates::Value(VariantAlternatesList( @@ -1194,7 +1193,7 @@ impl Parse for FontVariantAlternates { parsed_alternates |= $flag; ) ); - while let Ok(_) = input.r#try(|input| { + while let Ok(_) = input.try(|input| { // FIXME: remove clone() when lifetimes are non-lexical match input.next()?.clone() { Token::Ident(ref value) if value.eq_ignore_ascii_case("historical-forms") => { @@ -1409,13 +1408,13 @@ impl Parse for FontVariantEastAsian { let mut result = VariantEastAsian::empty(); if input - .r#try(|input| input.expect_ident_matching("normal")) + .try(|input| input.expect_ident_matching("normal")) .is_ok() { return Ok(FontVariantEastAsian::Value(result)); } - while let Ok(flag) = input.r#try(|input| { + while let Ok(flag) = input.try(|input| { Ok( match_ignore_ascii_case! { &input.expect_ident().map_err(|_| ())?, "jis78" => @@ -1633,19 +1632,19 @@ impl Parse for FontVariantLigatures { let mut result = VariantLigatures::empty(); if input - .r#try(|input| input.expect_ident_matching("normal")) + .try(|input| input.expect_ident_matching("normal")) .is_ok() { return Ok(FontVariantLigatures::Value(result)); } if input - .r#try(|input| input.expect_ident_matching("none")) + .try(|input| input.expect_ident_matching("none")) .is_ok() { return Ok(FontVariantLigatures::Value(VariantLigatures::NONE)); } - while let Ok(flag) = input.r#try(|input| { + while let Ok(flag) = input.try(|input| { Ok( match_ignore_ascii_case! { &input.expect_ident().map_err(|_| ())?, "common-ligatures" => @@ -1842,13 +1841,13 @@ impl Parse for FontVariantNumeric { let mut result = VariantNumeric::empty(); if input - .r#try(|input| input.expect_ident_matching("normal")) + .try(|input| input.expect_ident_matching("normal")) .is_ok() { return Ok(FontVariantNumeric::Value(result)); } - while let Ok(flag) = input.r#try(|input| { + while let Ok(flag) = input.try(|input| { Ok( match_ignore_ascii_case! { &input.expect_ident().map_err(|_| ())?, "ordinal" => @@ -1982,14 +1981,14 @@ impl Parse for FontSynthesis { "none" => Ok(result), "weight" => { result.weight = true; - if input.r#try(|input| input.expect_ident_matching("style")).is_ok() { + if input.try(|input| input.expect_ident_matching("style")).is_ok() { result.style = true; } Ok(result) }, "style" => { result.style = true; - if input.r#try(|input| input.expect_ident_matching("weight")).is_ok() { + if input.try(|input| input.expect_ident_matching("weight")).is_ok() { result.weight = true; } Ok(result) @@ -2128,7 +2127,7 @@ impl Parse for FontLanguageOverride { input: &mut Parser<'i, 't>, ) -> Result> { if input - .r#try(|input| input.expect_ident_matching("normal")) + .try(|input| input.expect_ident_matching("normal")) .is_ok() { return Ok(FontLanguageOverride::Normal); @@ -2195,7 +2194,7 @@ fn parse_one_feature_value<'i, 't>( context: &ParserContext, input: &mut Parser<'i, 't>, ) -> Result> { - if let Ok(integer) = input.r#try(|i| Integer::parse_non_negative(context, i)) { + if let Ok(integer) = input.try(|i| Integer::parse_non_negative(context, i)) { return Ok(integer); } @@ -2213,7 +2212,7 @@ impl Parse for FeatureTagValue { ) -> Result> { let tag = FontTag::parse(context, input)?; let value = input - .r#try(|i| parse_one_feature_value(context, i)) + .try(|i| parse_one_feature_value(context, i)) .unwrap_or_else(|_| Integer::new(1)); Ok(Self { tag, value }) @@ -2331,7 +2330,7 @@ impl Parse for MozScriptLevel { input: &mut Parser<'i, 't>, ) -> Result> { // We don't bother to handle calc here. - if let Ok(i) = input.r#try(|i| i.expect_integer()) { + if let Ok(i) = input.try(|i| i.expect_integer()) { return Ok(MozScriptLevel::Relative(i)); } input.expect_ident_matching("auto")?; diff --git a/components/style/values/specified/gecko.rs b/components/style/values/specified/gecko.rs index 5c1e502604d..1d8118fce1b 100644 --- a/components/style/values/specified/gecko.rs +++ b/components/style/values/specified/gecko.rs @@ -25,7 +25,7 @@ impl Parse for ScrollSnapPoint { context: &ParserContext, input: &mut Parser<'i, 't>, ) -> Result> { - if input.r#try(|i| i.expect_ident_matching("none")).is_ok() { + if input.try(|i| i.expect_ident_matching("none")).is_ok() { return Ok(GenericScrollSnapPoint::None); } input.expect_function_matching("repeat")?; diff --git a/components/style/values/specified/grid.rs b/components/style/values/specified/grid.rs index c26dd04908e..663971b8a43 100644 --- a/components/style/values/specified/grid.rs +++ b/components/style/values/specified/grid.rs @@ -36,11 +36,11 @@ impl Parse for TrackBreadth { context: &ParserContext, input: &mut Parser<'i, 't>, ) -> Result> { - if let Ok(lop) = input.r#try(|i| LengthOrPercentage::parse_non_negative(context, i)) { + if let Ok(lop) = input.try(|i| LengthOrPercentage::parse_non_negative(context, i)) { return Ok(TrackBreadth::Breadth(lop)); } - if let Ok(f) = input.r#try(parse_flex) { + if let Ok(f) = input.try(parse_flex) { return Ok(TrackBreadth::Fr(f)); } @@ -53,17 +53,14 @@ impl Parse for TrackSize { context: &ParserContext, input: &mut Parser<'i, 't>, ) -> Result> { - if let Ok(b) = input.r#try(|i| TrackBreadth::parse(context, i)) { + if let Ok(b) = input.try(|i| TrackBreadth::parse(context, i)) { return Ok(TrackSize::Breadth(b)); } - if input - .r#try(|i| i.expect_function_matching("minmax")) - .is_ok() - { + if input.try(|i| i.expect_function_matching("minmax")).is_ok() { return input.parse_nested_block(|input| { let inflexible_breadth = - match input.r#try(|i| LengthOrPercentage::parse_non_negative(context, i)) { + match input.try(|i| LengthOrPercentage::parse_non_negative(context, i)) { Ok(lop) => TrackBreadth::Breadth(lop), Err(..) => { let keyword = TrackKeyword::parse(input)?; @@ -95,7 +92,7 @@ pub fn parse_line_names<'i, 't>( input.expect_square_bracket_block()?; input.parse_nested_block(|input| { let mut values = vec![]; - while let Ok((loc, ident)) = input.r#try(|i| -> Result<_, CssParseError<()>> { + while let Ok((loc, ident)) = input.try(|i| -> Result<_, CssParseError<()>> { Ok((i.current_source_location(), i.expect_ident_cloned()?)) }) { let ident = CustomIdent::from_ident(loc, &ident, &["span", "auto"])?; @@ -126,7 +123,7 @@ impl TrackRepeat { input: &mut Parser<'i, 't>, ) -> Result<(Self, RepeatType), ParseError<'i>> { input - .r#try(|i| i.expect_function_matching("repeat").map_err(|e| e.into())) + .try(|i| i.expect_function_matching("repeat").map_err(|e| e.into())) .and_then(|_| { input.parse_nested_block(|input| { let count = RepeatCount::parse(context, input)?; @@ -146,9 +143,9 @@ impl TrackRepeat { loop { current_names = input - .r#try(parse_line_names) + .try(parse_line_names) .unwrap_or(vec![].into_boxed_slice()); - if let Ok(track_size) = input.r#try(|i| TrackSize::parse(context, i)) { + if let Ok(track_size) = input.try(|i| TrackSize::parse(context, i)) { if !track_size.is_fixed() { if is_auto { // should be for @@ -172,7 +169,7 @@ impl TrackRepeat { // gecko implements new spec. names.push( input - .r#try(parse_line_names) + .try(parse_line_names) .unwrap_or(vec![].into_boxed_slice()), ); break; @@ -226,10 +223,10 @@ impl Parse for TrackList { loop { current_names.extend_from_slice( &mut input - .r#try(parse_line_names) + .try(parse_line_names) .unwrap_or(vec![].into_boxed_slice()), ); - if let Ok(track_size) = input.r#try(|i| TrackSize::parse(context, i)) { + if let Ok(track_size) = input.try(|i| TrackSize::parse(context, i)) { if !track_size.is_fixed() { atleast_one_not_fixed = true; if auto_repeat.is_some() { @@ -242,7 +239,7 @@ impl Parse for TrackList { names.push(vec.into_boxed_slice()); values.push(TrackListValue::TrackSize(track_size)); } else if let Ok((repeat, type_)) = - input.r#try(|i| TrackRepeat::parse_with_repeat_type(context, i)) + input.try(|i| TrackRepeat::parse_with_repeat_type(context, i)) { if list_type == TrackListType::Explicit { list_type = TrackListType::Normal; // doesn't contain repeat() @@ -404,7 +401,7 @@ impl Parse for GridTemplateComponent { context: &ParserContext, input: &mut Parser<'i, 't>, ) -> Result> { - if input.r#try(|i| i.expect_ident_matching("none")).is_ok() { + if input.try(|i| i.expect_ident_matching("none")).is_ok() { return Ok(GridTemplateComponent::None); } @@ -419,7 +416,7 @@ impl GridTemplateComponent { input: &mut Parser<'i, 't>, ) -> Result> { if allow_grid_template_subgrids() { - if let Ok(t) = input.r#try(|i| LineNameList::parse(context, i)) { + if let Ok(t) = input.try(|i| LineNameList::parse(context, i)) { return Ok(GridTemplateComponent::Subgrid(t)); } } diff --git a/components/style/values/specified/image.rs b/components/style/values/specified/image.rs index fdf7630a9b2..6366facf049 100644 --- a/components/style/values/specified/image.rs +++ b/components/style/values/specified/image.rs @@ -39,7 +39,7 @@ impl ImageLayer { context: &ParserContext, input: &mut Parser<'i, 't>, ) -> Result> { - if let Ok(v) = input.r#try(|i| None_::parse(context, i)) { + if let Ok(v) = input.try(|i| None_::parse(context, i)) { return Ok(Either::First(v)); } Image::parse_with_cors_anonymous(context, input).map(Either::Second) @@ -142,19 +142,19 @@ impl Parse for Image { context: &ParserContext, input: &mut Parser<'i, 't>, ) -> Result> { - if let Ok(url) = input.r#try(|input| SpecifiedImageUrl::parse(context, input)) { + if let Ok(url) = input.try(|input| SpecifiedImageUrl::parse(context, input)) { return Ok(generic::Image::Url(url)); } - if let Ok(gradient) = input.r#try(|i| Gradient::parse(context, i)) { + if let Ok(gradient) = input.try(|i| Gradient::parse(context, i)) { return Ok(generic::Image::Gradient(Box::new(gradient))); } #[cfg(feature = "servo")] { - if let Ok(paint_worklet) = input.r#try(|i| PaintWorklet::parse(context, i)) { + if let Ok(paint_worklet) = input.try(|i| PaintWorklet::parse(context, i)) { return Ok(generic::Image::PaintWorklet(paint_worklet)); } } - if let Ok(image_rect) = input.r#try(|input| MozImageRect::parse(context, input)) { + if let Ok(image_rect) = input.try(|input| MozImageRect::parse(context, input)) { return Ok(generic::Image::Rect(Box::new(image_rect))); } Ok(generic::Image::Element(Image::parse_element(input)?)) @@ -172,7 +172,7 @@ impl Image { /// Parses a `-moz-element(# )`. fn parse_element<'i, 't>(input: &mut Parser<'i, 't>) -> Result> { - input.r#try(|i| i.expect_function_matching("-moz-element"))?; + input.try(|i| i.expect_function_matching("-moz-element"))?; let location = input.current_source_location(); input.parse_nested_block(|i| match *i.next()? { Token::IDHash(ref id) => Ok(Atom::from(id.as_ref())), @@ -190,7 +190,7 @@ impl Image { input: &mut Parser<'i, 't>, ) -> Result> { if let Ok(url) = - input.r#try(|input| SpecifiedImageUrl::parse_with_cors_anonymous(context, input)) + input.try(|input| SpecifiedImageUrl::parse_with_cors_anonymous(context, input)) { return Ok(generic::Image::Url(url)); } @@ -350,7 +350,7 @@ impl Gradient { context: &ParserContext, input: &mut Parser<'i, 't>, ) -> Result> { - input.r#try(|i| { + input.try(|i| { let x = Component::parse(context, i)?; let y = Component::parse(context, i)?; @@ -413,13 +413,13 @@ impl Gradient { context: &ParserContext, input: &mut Parser<'i, 't>, ) -> Result> { - if let Ok(side) = input.r#try(|i| S::parse(context, i)) { + if let Ok(side) = input.try(|i| S::parse(context, i)) { return Ok(Component::Side(side)); } - if let Ok(number) = input.r#try(|i| NumberOrPercentage::parse(context, i)) { + if let Ok(number) = input.try(|i| NumberOrPercentage::parse(context, i)) { return Ok(Component::Number(number)); } - input.r#try(|i| i.expect_ident_matching("center"))?; + input.try(|i| i.expect_ident_matching("center"))?; Ok(Component::Center) } } @@ -477,7 +477,7 @@ impl Gradient { }; let mut items = input - .r#try(|i| { + .try(|i| { i.expect_comma()?; i.parse_comma_separated(|i| { let function = i.expect_function()?.clone(); @@ -572,16 +572,16 @@ impl GradientKind { input: &mut Parser<'i, 't>, compat_mode: &mut CompatMode, ) -> Result> { - let direction = - if let Ok(d) = input.r#try(|i| LineDirection::parse(context, i, compat_mode)) { - input.expect_comma()?; - d - } else { - match *compat_mode { - CompatMode::Modern => LineDirection::Vertical(Y::Bottom), - _ => LineDirection::Vertical(Y::Top), - } - }; + let direction = if let Ok(d) = input.try(|i| LineDirection::parse(context, i, compat_mode)) + { + input.expect_comma()?; + d + } else { + match *compat_mode { + CompatMode::Modern => LineDirection::Vertical(Y::Bottom), + _ => LineDirection::Vertical(Y::Top), + } + }; Ok(generic::GradientKind::Linear(direction)) } @@ -592,16 +592,16 @@ impl GradientKind { ) -> Result> { let (shape, position, angle, moz_position) = match *compat_mode { CompatMode::Modern => { - let shape = input.r#try(|i| EndingShape::parse(context, i, *compat_mode)); - let position = input.r#try(|i| { + let shape = input.try(|i| EndingShape::parse(context, i, *compat_mode)); + let position = input.try(|i| { i.expect_ident_matching("at")?; Position::parse(context, i) }); (shape, position.ok(), None, None) }, CompatMode::WebKit => { - let position = input.r#try(|i| Position::parse(context, i)); - let shape = input.r#try(|i| { + let position = input.try(|i| Position::parse(context, i)); + let shape = input.try(|i| { if position.is_ok() { i.expect_comma()?; } @@ -620,13 +620,13 @@ impl GradientKind { // cover | contain // and = [ | ]? CompatMode::Moz => { - let mut position = input.r#try(|i| LegacyPosition::parse(context, i)); - let angle = input.r#try(|i| Angle::parse(context, i)).ok(); + let mut position = input.try(|i| LegacyPosition::parse(context, i)); + let angle = input.try(|i| Angle::parse(context, i)).ok(); if position.is_err() { - position = input.r#try(|i| LegacyPosition::parse(context, i)); + position = input.try(|i| LegacyPosition::parse(context, i)); } - let shape = input.r#try(|i| { + let shape = input.try(|i| { if position.is_ok() || angle.is_some() { i.expect_comma()?; } @@ -768,18 +768,18 @@ impl LineDirection { compat_mode: &mut CompatMode, ) -> Result> { let mut _angle = if *compat_mode == CompatMode::Moz { - input.r#try(|i| Angle::parse(context, i)).ok() + input.try(|i| Angle::parse(context, i)).ok() } else { // Gradients allow unitless zero angles as an exception, see: // https://github.com/w3c/csswg-drafts/issues/1162 - if let Ok(angle) = input.r#try(|i| Angle::parse_with_unitless(context, i)) { + if let Ok(angle) = input.try(|i| Angle::parse_with_unitless(context, i)) { return Ok(LineDirection::Angle(angle)); } None }; - input.r#try(|i| { - let to_ident = i.r#try(|i| i.expect_ident_matching("to")); + input.try(|i| { + let to_ident = i.try(|i| i.expect_ident_matching("to")); match *compat_mode { // `to` keyword is mandatory in modern syntax. CompatMode::Modern => to_ident?, @@ -801,9 +801,9 @@ impl LineDirection { { // `-moz-` prefixed linear gradient can be both Angle and Position. if *compat_mode == CompatMode::Moz { - let position = i.r#try(|i| LegacyPosition::parse(context, i)).ok(); + let position = i.try(|i| LegacyPosition::parse(context, i)).ok(); if _angle.is_none() { - _angle = i.r#try(|i| Angle::parse(context, i)).ok(); + _angle = i.try(|i| Angle::parse(context, i)).ok(); }; if _angle.is_none() && position.is_none() { @@ -813,14 +813,14 @@ impl LineDirection { } } - if let Ok(x) = i.r#try(X::parse) { - if let Ok(y) = i.r#try(Y::parse) { + if let Ok(x) = i.try(X::parse) { + if let Ok(y) = i.try(Y::parse) { return Ok(LineDirection::Corner(x, y)); } return Ok(LineDirection::Horizontal(x)); } let y = Y::parse(i)?; - if let Ok(x) = i.r#try(X::parse) { + if let Ok(x) = i.try(X::parse) { return Ok(LineDirection::Corner(x, y)); } Ok(LineDirection::Vertical(y)) @@ -850,20 +850,19 @@ impl EndingShape { input: &mut Parser<'i, 't>, compat_mode: CompatMode, ) -> Result> { - if let Ok(extent) = input.r#try(|i| ShapeExtent::parse_with_compat_mode(i, compat_mode)) { - if input.r#try(|i| i.expect_ident_matching("circle")).is_ok() { + if let Ok(extent) = input.try(|i| ShapeExtent::parse_with_compat_mode(i, compat_mode)) { + if input.try(|i| i.expect_ident_matching("circle")).is_ok() { return Ok(generic::EndingShape::Circle(Circle::Extent(extent))); } - let _ = input.r#try(|i| i.expect_ident_matching("ellipse")); + let _ = input.try(|i| i.expect_ident_matching("ellipse")); return Ok(generic::EndingShape::Ellipse(Ellipse::Extent(extent))); } - if input.r#try(|i| i.expect_ident_matching("circle")).is_ok() { - if let Ok(extent) = input.r#try(|i| ShapeExtent::parse_with_compat_mode(i, compat_mode)) - { + if input.try(|i| i.expect_ident_matching("circle")).is_ok() { + if let Ok(extent) = input.try(|i| ShapeExtent::parse_with_compat_mode(i, compat_mode)) { return Ok(generic::EndingShape::Circle(Circle::Extent(extent))); } if compat_mode == CompatMode::Modern { - if let Ok(length) = input.r#try(|i| Length::parse(context, i)) { + if let Ok(length) = input.try(|i| Length::parse(context, i)) { return Ok(generic::EndingShape::Circle(Circle::Radius(length))); } } @@ -871,13 +870,12 @@ impl EndingShape { ShapeExtent::FarthestCorner, ))); } - if input.r#try(|i| i.expect_ident_matching("ellipse")).is_ok() { - if let Ok(extent) = input.r#try(|i| ShapeExtent::parse_with_compat_mode(i, compat_mode)) - { + if input.try(|i| i.expect_ident_matching("ellipse")).is_ok() { + if let Ok(extent) = input.try(|i| ShapeExtent::parse_with_compat_mode(i, compat_mode)) { return Ok(generic::EndingShape::Ellipse(Ellipse::Extent(extent))); } if compat_mode == CompatMode::Modern { - let pair: Result<_, ParseError> = input.r#try(|i| { + let pair: Result<_, ParseError> = input.try(|i| { let x = LengthOrPercentage::parse(context, i)?; let y = LengthOrPercentage::parse(context, i)?; Ok((x, y)) @@ -893,10 +891,10 @@ impl EndingShape { // -moz- prefixed radial gradient doesn't allow EndingShape's Length or LengthOrPercentage // to come before shape keyword. Otherwise it conflicts with . if compat_mode != CompatMode::Moz { - if let Ok(length) = input.r#try(|i| Length::parse(context, i)) { - if let Ok(y) = input.r#try(|i| LengthOrPercentage::parse(context, i)) { + if let Ok(length) = input.try(|i| Length::parse(context, i)) { + if let Ok(y) = input.try(|i| LengthOrPercentage::parse(context, i)) { if compat_mode == CompatMode::Modern { - let _ = input.r#try(|i| i.expect_ident_matching("ellipse")); + let _ = input.try(|i| i.expect_ident_matching("ellipse")); } return Ok(generic::EndingShape::Ellipse(Ellipse::Radii( length.into(), @@ -904,7 +902,7 @@ impl EndingShape { ))); } if compat_mode == CompatMode::Modern { - let y = input.r#try(|i| { + let y = input.try(|i| { i.expect_ident_matching("ellipse")?; LengthOrPercentage::parse(context, i) }); @@ -914,17 +912,17 @@ impl EndingShape { y, ))); } - let _ = input.r#try(|i| i.expect_ident_matching("circle")); + let _ = input.try(|i| i.expect_ident_matching("circle")); } return Ok(generic::EndingShape::Circle(Circle::Radius(length))); } } - input.r#try(|i| { + input.try(|i| { let x = Percentage::parse(context, i)?; - let y = if let Ok(y) = i.r#try(|i| LengthOrPercentage::parse(context, i)) { + let y = if let Ok(y) = i.try(|i| LengthOrPercentage::parse(context, i)) { if compat_mode == CompatMode::Modern { - let _ = i.r#try(|i| i.expect_ident_matching("ellipse")); + let _ = i.try(|i| i.expect_ident_matching("ellipse")); } y } else { @@ -965,7 +963,7 @@ impl GradientItem { loop { input.parse_until_before(Delimiter::Comma, |input| { if seen_stop { - if let Ok(hint) = input.r#try(|i| LengthOrPercentage::parse(context, i)) { + if let Ok(hint) = input.try(|i| LengthOrPercentage::parse(context, i)) { seen_stop = false; items.push(generic::GradientItem::InterpolationHint(hint)); return Ok(()); @@ -974,7 +972,7 @@ impl GradientItem { let stop = ColorStop::parse(context, input)?; - if let Ok(multi_position) = input.r#try(|i| LengthOrPercentage::parse(context, i)) { + if let Ok(multi_position) = input.try(|i| LengthOrPercentage::parse(context, i)) { let stop_color = stop.color.clone(); items.push(generic::GradientItem::ColorStop(stop)); items.push(generic::GradientItem::ColorStop(ColorStop { @@ -1010,7 +1008,7 @@ impl Parse for ColorStop { ) -> Result> { Ok(ColorStop { color: Color::parse(context, input)?, - position: input.r#try(|i| LengthOrPercentage::parse(context, i)).ok(), + position: input.try(|i| LengthOrPercentage::parse(context, i)).ok(), }) } } @@ -1024,7 +1022,7 @@ impl Parse for PaintWorklet { input.parse_nested_block(|input| { let name = Atom::from(&**input.expect_ident()?); let arguments = input - .r#try(|input| { + .try(|input| { input.expect_comma()?; input.parse_comma_separated(|input| SpecifiedValue::parse(input)) }) @@ -1039,7 +1037,7 @@ impl Parse for MozImageRect { context: &ParserContext, input: &mut Parser<'i, 't>, ) -> Result> { - input.r#try(|i| i.expect_function_matching("-moz-image-rect"))?; + input.try(|i| i.expect_function_matching("-moz-image-rect"))?; input.parse_nested_block(|i| { let string = i.expect_url_or_string()?; let url = SpecifiedImageUrl::parse_from_string(string.as_ref().to_owned(), context); diff --git a/components/style/values/specified/length.rs b/components/style/values/specified/length.rs index e3c04d47959..2c8498e15bb 100644 --- a/components/style/values/specified/length.rs +++ b/components/style/values/specified/length.rs @@ -1228,7 +1228,7 @@ impl LengthOrNumber { // We try to parse as a Number first because, for cases like // LengthOrNumber, we want "0" to be parsed as a plain Number rather // than a Length (0px); this matches the behaviour of all major browsers - if let Ok(v) = input.r#try(|i| Number::parse_non_negative(context, i)) { + if let Ok(v) = input.try(|i| Number::parse_non_negative(context, i)) { return Ok(Either::Second(v)); } @@ -1272,7 +1272,7 @@ impl MozLength { input: &mut Parser<'i, 't>, allow_quirks: AllowQuirks, ) -> Result> { - if let Ok(l) = input.r#try(ExtremumLength::parse) { + if let Ok(l) = input.try(ExtremumLength::parse) { return Ok(GenericMozLength::ExtremumLength(l)); } @@ -1324,7 +1324,7 @@ impl MaxLength { input: &mut Parser<'i, 't>, allow_quirks: AllowQuirks, ) -> Result> { - if let Ok(l) = input.r#try(ExtremumLength::parse) { + if let Ok(l) = input.try(ExtremumLength::parse) { return Ok(GenericMaxLength::ExtremumLength(l)); } diff --git a/components/style/values/specified/list.rs b/components/style/values/specified/list.rs index a793bf29238..2bdd3c10397 100644 --- a/components/style/values/specified/list.rs +++ b/components/style/values/specified/list.rs @@ -63,7 +63,7 @@ impl Parse for ListStyleType { context: &ParserContext, input: &mut Parser<'i, 't>, ) -> Result> { - if let Ok(style) = input.r#try(|i| CounterStyleOrNone::parse(context, i)) { + if let Ok(style) = input.try(|i| CounterStyleOrNone::parse(context, i)) { return Ok(ListStyleType::CounterStyle(style)); } @@ -97,7 +97,7 @@ impl Parse for Quotes { input: &mut Parser<'i, 't>, ) -> Result> { if input - .r#try(|input| input.expect_ident_matching("none")) + .try(|input| input.expect_ident_matching("none")) .is_ok() { return Ok(Quotes(Arc::new(Box::new([])))); diff --git a/components/style/values/specified/mod.rs b/components/style/values/specified/mod.rs index d416be80197..3b7a3d0e04e 100644 --- a/components/style/values/specified/mod.rs +++ b/components/style/values/specified/mod.rs @@ -359,7 +359,7 @@ impl NumberOrPercentage { input: &mut Parser<'i, 't>, type_: AllowedNumericType, ) -> Result> { - if let Ok(per) = input.r#try(|i| Percentage::parse_with_clamping_mode(context, i, type_)) { + if let Ok(per) = input.try(|i| Percentage::parse_with_clamping_mode(context, i, type_)) { return Ok(NumberOrPercentage::Percentage(per)); } @@ -703,7 +703,7 @@ impl ClipRect { allow_quirks: AllowQuirks, ) -> Result, ParseError<'i>> { if input - .r#try(|input| input.expect_ident_matching("auto")) + .try(|input| input.expect_ident_matching("auto")) .is_ok() { Ok(None) @@ -720,7 +720,7 @@ impl ClipRect { let bottom; let left; - if input.r#try(|input| input.expect_comma()).is_ok() { + if input.try(|input| input.expect_comma()).is_ok() { right = parse_argument(context, input, allow_quirks)?; input.expect_comma()?; bottom = parse_argument(context, input, allow_quirks)?; @@ -751,7 +751,7 @@ impl ClipRectOrAuto { input: &mut Parser<'i, 't>, allow_quirks: AllowQuirks, ) -> Result> { - if let Ok(v) = input.r#try(|i| ClipRect::parse_quirky(context, i, allow_quirks)) { + if let Ok(v) = input.try(|i| ClipRect::parse_quirky(context, i, allow_quirks)) { Ok(Either::First(v)) } else { Auto::parse(context, input).map(Either::Second) @@ -816,8 +816,8 @@ impl Attr { ) -> Result> { // Syntax is `[namespace? `|`]? ident` // no spaces allowed - let first = input.r#try(|i| i.expect_ident_cloned()).ok(); - if let Ok(token) = input.r#try(|i| i.next_including_whitespace().map(|t| t.clone())) { + let first = input.try(|i| i.expect_ident_cloned()).ok(); + if let Ok(token) = input.try(|i| i.next_including_whitespace().map(|t| t.clone())) { match token { Token::Delim('|') => { let location = input.current_source_location(); diff --git a/components/style/values/specified/motion.rs b/components/style/values/specified/motion.rs index 632b29a45b9..80fb8630f22 100644 --- a/components/style/values/specified/motion.rs +++ b/components/style/values/specified/motion.rs @@ -50,7 +50,7 @@ impl Parse for OffsetPath { input: &mut Parser<'i, 't>, ) -> Result> { // Parse none. - if input.r#try(|i| i.expect_ident_matching("none")).is_ok() { + if input.try(|i| i.expect_ident_matching("none")).is_ok() { return Ok(OffsetPath::none()); } diff --git a/components/style/values/specified/outline.rs b/components/style/values/specified/outline.rs index 46f1acd0b89..890f9dc3020 100644 --- a/components/style/values/specified/outline.rs +++ b/components/style/values/specified/outline.rs @@ -53,7 +53,7 @@ impl Parse for OutlineStyle { _context: &ParserContext, input: &mut Parser<'i, 't>, ) -> Result> { - if let Ok(border_style) = input.r#try(BorderStyle::parse) { + if let Ok(border_style) = input.try(BorderStyle::parse) { if let BorderStyle::Hidden = border_style { return Err(input .new_custom_error(SelectorParseErrorKind::UnexpectedIdent("hidden".into()))); diff --git a/components/style/values/specified/position.rs b/components/style/values/specified/position.rs index fa14825caed..62895e1ac9f 100644 --- a/components/style/values/specified/position.rs +++ b/components/style/values/specified/position.rs @@ -102,28 +102,28 @@ impl Position { input: &mut Parser<'i, 't>, allow_quirks: AllowQuirks, ) -> Result> { - match input.r#try(|i| PositionComponent::parse_quirky(context, i, allow_quirks)) { + match input.try(|i| PositionComponent::parse_quirky(context, i, allow_quirks)) { Ok(x_pos @ PositionComponent::Center) => { if let Ok(y_pos) = - input.r#try(|i| PositionComponent::parse_quirky(context, i, allow_quirks)) + input.try(|i| PositionComponent::parse_quirky(context, i, allow_quirks)) { return Ok(Self::new(x_pos, y_pos)); } let x_pos = input - .r#try(|i| PositionComponent::parse_quirky(context, i, allow_quirks)) + .try(|i| PositionComponent::parse_quirky(context, i, allow_quirks)) .unwrap_or(x_pos); let y_pos = PositionComponent::Center; return Ok(Self::new(x_pos, y_pos)); }, Ok(PositionComponent::Side(x_keyword, lop)) => { - if input.r#try(|i| i.expect_ident_matching("center")).is_ok() { + if input.try(|i| i.expect_ident_matching("center")).is_ok() { let x_pos = PositionComponent::Side(x_keyword, lop); let y_pos = PositionComponent::Center; return Ok(Self::new(x_pos, y_pos)); } - if let Ok(y_keyword) = input.r#try(Y::parse) { + if let Ok(y_keyword) = input.try(Y::parse) { let y_lop = input - .r#try(|i| LengthOrPercentage::parse_quirky(context, i, allow_quirks)) + .try(|i| LengthOrPercentage::parse_quirky(context, i, allow_quirks)) .ok(); let x_pos = PositionComponent::Side(x_keyword, lop); let y_pos = PositionComponent::Side(y_keyword, y_lop); @@ -134,30 +134,30 @@ impl Position { return Ok(Self::new(x_pos, y_pos)); }, Ok(x_pos @ PositionComponent::Length(_)) => { - if let Ok(y_keyword) = input.r#try(Y::parse) { + if let Ok(y_keyword) = input.try(Y::parse) { let y_pos = PositionComponent::Side(y_keyword, None); return Ok(Self::new(x_pos, y_pos)); } if let Ok(y_lop) = - input.r#try(|i| LengthOrPercentage::parse_quirky(context, i, allow_quirks)) + input.try(|i| LengthOrPercentage::parse_quirky(context, i, allow_quirks)) { let y_pos = PositionComponent::Length(y_lop); return Ok(Self::new(x_pos, y_pos)); } let y_pos = PositionComponent::Center; - let _ = input.r#try(|i| i.expect_ident_matching("center")); + let _ = input.try(|i| i.expect_ident_matching("center")); return Ok(Self::new(x_pos, y_pos)); }, Err(_) => {}, } let y_keyword = Y::parse(input)?; - let lop_and_x_pos: Result<_, ParseError> = input.r#try(|i| { + let lop_and_x_pos: Result<_, ParseError> = input.try(|i| { let y_lop = i - .r#try(|i| LengthOrPercentage::parse_quirky(context, i, allow_quirks)) + .try(|i| LengthOrPercentage::parse_quirky(context, i, allow_quirks)) .ok(); - if let Ok(x_keyword) = i.r#try(X::parse) { + if let Ok(x_keyword) = i.try(X::parse) { let x_lop = i - .r#try(|i| LengthOrPercentage::parse_quirky(context, i, allow_quirks)) + .try(|i| LengthOrPercentage::parse_quirky(context, i, allow_quirks)) .ok(); let x_pos = PositionComponent::Side(x_keyword, x_lop); return Ok((y_lop, x_pos)); @@ -230,16 +230,15 @@ impl PositionComponent { input: &mut Parser<'i, 't>, allow_quirks: AllowQuirks, ) -> Result> { - if input.r#try(|i| i.expect_ident_matching("center")).is_ok() { + if input.try(|i| i.expect_ident_matching("center")).is_ok() { return Ok(PositionComponent::Center); } - if let Ok(lop) = input.r#try(|i| LengthOrPercentage::parse_quirky(context, i, allow_quirks)) - { + if let Ok(lop) = input.try(|i| LengthOrPercentage::parse_quirky(context, i, allow_quirks)) { return Ok(PositionComponent::Length(lop)); } let keyword = S::parse(context, input)?; let lop = input - .r#try(|i| LengthOrPercentage::parse_quirky(context, i, allow_quirks)) + .try(|i| LengthOrPercentage::parse_quirky(context, i, allow_quirks)) .ok(); Ok(PositionComponent::Side(keyword, lop)) } @@ -360,51 +359,51 @@ impl LegacyPosition { input: &mut Parser<'i, 't>, allow_quirks: AllowQuirks, ) -> Result> { - match input.r#try(|i| OriginComponent::parse(context, i)) { + match input.try(|i| OriginComponent::parse(context, i)) { Ok(x_pos @ OriginComponent::Center) => { - if let Ok(y_pos) = input.r#try(|i| OriginComponent::parse(context, i)) { + if let Ok(y_pos) = input.try(|i| OriginComponent::parse(context, i)) { return Ok(Self::new(x_pos, y_pos)); } let x_pos = input - .r#try(|i| OriginComponent::parse(context, i)) + .try(|i| OriginComponent::parse(context, i)) .unwrap_or(x_pos); let y_pos = OriginComponent::Center; return Ok(Self::new(x_pos, y_pos)); }, Ok(OriginComponent::Side(x_keyword)) => { - if let Ok(y_keyword) = input.r#try(Y::parse) { + if let Ok(y_keyword) = input.try(Y::parse) { let x_pos = OriginComponent::Side(x_keyword); let y_pos = OriginComponent::Side(y_keyword); return Ok(Self::new(x_pos, y_pos)); } let x_pos = OriginComponent::Side(x_keyword); if let Ok(y_lop) = - input.r#try(|i| LengthOrPercentage::parse_quirky(context, i, allow_quirks)) + input.try(|i| LengthOrPercentage::parse_quirky(context, i, allow_quirks)) { return Ok(Self::new(x_pos, OriginComponent::Length(y_lop))); } - let _ = input.r#try(|i| i.expect_ident_matching("center")); + let _ = input.try(|i| i.expect_ident_matching("center")); return Ok(Self::new(x_pos, OriginComponent::Center)); }, Ok(x_pos @ OriginComponent::Length(_)) => { - if let Ok(y_keyword) = input.r#try(Y::parse) { + if let Ok(y_keyword) = input.try(Y::parse) { let y_pos = OriginComponent::Side(y_keyword); return Ok(Self::new(x_pos, y_pos)); } if let Ok(y_lop) = - input.r#try(|i| LengthOrPercentage::parse_quirky(context, i, allow_quirks)) + input.try(|i| LengthOrPercentage::parse_quirky(context, i, allow_quirks)) { let y_pos = OriginComponent::Length(y_lop); return Ok(Self::new(x_pos, y_pos)); } - let _ = input.r#try(|i| i.expect_ident_matching("center")); + let _ = input.try(|i| i.expect_ident_matching("center")); return Ok(Self::new(x_pos, OriginComponent::Center)); }, Err(_) => {}, } let y_keyword = Y::parse(input)?; - let x_pos: Result<_, ParseError> = input.r#try(|i| { - if let Ok(x_keyword) = i.r#try(X::parse) { + let x_pos: Result<_, ParseError> = input.try(|i| { + if let Ok(x_keyword) = i.try(X::parse) { let x_pos = OriginComponent::Side(x_keyword); return Ok(x_pos); } @@ -649,7 +648,7 @@ impl Parse for TemplateAreas { input: &mut Parser<'i, 't>, ) -> Result> { let mut strings = vec![]; - while let Ok(string) = input.r#try(|i| i.expect_string().map(|s| s.as_ref().into())) { + while let Ok(string) = input.try(|i| i.expect_string().map(|s| s.as_ref().into())) { strings.push(string); } @@ -743,7 +742,7 @@ impl Parse for ZIndex { context: &ParserContext, input: &mut Parser<'i, 't>, ) -> Result> { - if input.r#try(|i| i.expect_ident_matching("auto")).is_ok() { + if input.try(|i| i.expect_ident_matching("auto")).is_ok() { return Ok(GenericZIndex::Auto); } Ok(GenericZIndex::Integer(Integer::parse(context, input)?)) diff --git a/components/style/values/specified/source_size_list.rs b/components/style/values/specified/source_size_list.rs index c7a15c3bfb2..9096b53905b 100644 --- a/components/style/values/specified/source_size_list.rs +++ b/components/style/values/specified/source_size_list.rs @@ -92,7 +92,7 @@ impl Parse for SourceSizeOrLength { context: &ParserContext, input: &mut Parser<'i, 't>, ) -> Result> { - if let Ok(size) = input.r#try(|input| SourceSize::parse(context, input)) { + if let Ok(size) = input.try(|input| SourceSize::parse(context, input)) { return Ok(SourceSizeOrLength::SourceSize(size)); } diff --git a/components/style/values/specified/svg.rs b/components/style/values/specified/svg.rs index a09a2236c92..e1f62288c00 100644 --- a/components/style/values/specified/svg.rs +++ b/components/style/values/specified/svg.rs @@ -63,7 +63,7 @@ impl Parse for SVGLength { input: &mut Parser<'i, 't>, ) -> Result> { input - .r#try(|i| SvgLengthOrPercentageOrNumber::parse(context, i)) + .try(|i| SvgLengthOrPercentageOrNumber::parse(context, i)) .map(Into::into) .or_else(|_| parse_context_value(input, generic::SVGLength::ContextValue)) } @@ -89,7 +89,7 @@ impl Parse for SVGWidth { input: &mut Parser<'i, 't>, ) -> Result> { input - .r#try(|i| NonNegativeSvgLengthOrPercentageOrNumber::parse(context, i)) + .try(|i| NonNegativeSvgLengthOrPercentageOrNumber::parse(context, i)) .map(Into::into) .or_else(|_| parse_context_value(input, generic::SVGLength::ContextValue)) } @@ -109,13 +109,13 @@ impl Parse for SVGStrokeDashArray { context: &ParserContext, input: &mut Parser<'i, 't>, ) -> Result> { - if let Ok(values) = input.r#try(|i| { + if let Ok(values) = input.try(|i| { CommaWithSpace::parse(i, |i| { NonNegativeSvgLengthOrPercentageOrNumber::parse(context, i) }) }) { Ok(generic::SVGStrokeDashArray::Values(values)) - } else if let Ok(_) = input.r#try(|i| i.expect_ident_matching("none")) { + } else if let Ok(_) = input.try(|i| i.expect_ident_matching("none")) { Ok(generic::SVGStrokeDashArray::Values(vec![])) } else { parse_context_value(input, generic::SVGStrokeDashArray::ContextValue) @@ -131,7 +131,7 @@ impl Parse for SVGOpacity { context: &ParserContext, input: &mut Parser<'i, 't>, ) -> Result> { - if let Ok(opacity) = input.r#try(|i| Opacity::parse(context, i)) { + if let Ok(opacity) = input.try(|i| Opacity::parse(context, i)) { return Ok(generic::SVGOpacity::Opacity(opacity)); } @@ -196,7 +196,7 @@ impl Parse for SVGPaintOrder { _context: &ParserContext, input: &mut Parser<'i, 't>, ) -> Result> { - if let Ok(()) = input.r#try(|i| i.expect_ident_matching("normal")) { + if let Ok(()) = input.try(|i| i.expect_ident_matching("normal")) { return Ok(SVGPaintOrder::normal()); } @@ -207,7 +207,7 @@ impl Parse for SVGPaintOrder { let mut pos = 0; loop { - let result: Result<_, ParseError> = input.r#try(|input| { + let result: Result<_, ParseError> = input.try(|input| { try_match_ident_ignore_ascii_case! { input, "fill" => Ok(PaintOrder::Fill), "stroke" => Ok(PaintOrder::Stroke), diff --git a/components/style/values/specified/text.rs b/components/style/values/specified/text.rs index 0074d7e0bec..c3f6289972c 100644 --- a/components/style/values/specified/text.rs +++ b/components/style/values/specified/text.rs @@ -45,11 +45,11 @@ impl Parse for InitialLetter { context: &ParserContext, input: &mut Parser<'i, 't>, ) -> Result> { - if input.r#try(|i| i.expect_ident_matching("normal")).is_ok() { + if input.try(|i| i.expect_ident_matching("normal")).is_ok() { return Ok(GenericInitialLetter::Normal); } let size = Number::parse_at_least_one(context, input)?; - let sink = input.r#try(|i| Integer::parse_positive(context, i)).ok(); + let sink = input.try(|i| Integer::parse_positive(context, i)).ok(); Ok(GenericInitialLetter::Specified(size, sink)) } } @@ -81,10 +81,10 @@ impl Parse for LineHeight { context: &ParserContext, input: &mut Parser<'i, 't>, ) -> Result> { - if let Ok(number) = input.r#try(|i| NonNegativeNumber::parse(context, i)) { + if let Ok(number) = input.try(|i| NonNegativeNumber::parse(context, i)) { return Ok(GenericLineHeight::Number(number)); } - if let Ok(nlop) = input.r#try(|i| NonNegativeLengthOrPercentage::parse(context, i)) { + if let Ok(nlop) = input.try(|i| NonNegativeLengthOrPercentage::parse(context, i)) { return Ok(GenericLineHeight::Length(nlop)); } let location = input.current_source_location(); @@ -215,7 +215,7 @@ impl Parse for TextOverflow { ) -> Result> { let first = TextOverflowSide::parse(context, input)?; let second = input - .r#try(|input| TextOverflowSide::parse(context, input)) + .try(|input| TextOverflowSide::parse(context, input)) .ok(); Ok(TextOverflow { first, second }) } @@ -295,14 +295,14 @@ macro_rules! impl_text_decoration_line { ) -> Result> { let mut result = TextDecorationLine::NONE; if input - .r#try(|input| input.expect_ident_matching("none")) + .try(|input| input.expect_ident_matching("none")) .is_ok() { return Ok(result); } loop { - let result = input.r#try(|input| { + let result = input.try(|input| { let ident = input.expect_ident().map_err(|_| ())?; match_ignore_ascii_case! { ident, $( @@ -444,7 +444,7 @@ impl Parse for TextAlign { input: &mut Parser<'i, 't>, ) -> Result> { // MozCenterOrInherit cannot be parsed, only set directly on the elements - if let Ok(key) = input.r#try(TextAlignKeyword::parse) { + if let Ok(key) = input.try(TextAlignKeyword::parse) { return Ok(TextAlign::Keyword(key)); } #[cfg(feature = "gecko")] @@ -678,22 +678,22 @@ impl Parse for TextEmphasisStyle { input: &mut Parser<'i, 't>, ) -> Result> { if input - .r#try(|input| input.expect_ident_matching("none")) + .try(|input| input.expect_ident_matching("none")) .is_ok() { return Ok(TextEmphasisStyle::None); } - if let Ok(s) = input.r#try(|i| i.expect_string().map(|s| s.as_ref().to_owned())) { + if let Ok(s) = input.try(|i| i.expect_string().map(|s| s.as_ref().to_owned())) { // Handle return Ok(TextEmphasisStyle::String(s)); } // Handle a pair of keywords - let mut shape = input.r#try(TextEmphasisShapeKeyword::parse).ok(); - let fill = input.r#try(TextEmphasisFillMode::parse).ok(); + let mut shape = input.try(TextEmphasisShapeKeyword::parse).ok(); + let fill = input.try(TextEmphasisFillMode::parse).ok(); if shape.is_none() { - shape = input.r#try(TextEmphasisShapeKeyword::parse).ok(); + shape = input.try(TextEmphasisShapeKeyword::parse).ok(); } // At least one of shape or fill must be handled @@ -793,7 +793,7 @@ impl Parse for TextEmphasisPosition { input: &mut Parser<'i, 't>, ) -> Result> { if let Ok(horizontal) = - input.r#try(|input| TextEmphasisHorizontalWritingModeValue::parse(input)) + input.try(|input| TextEmphasisHorizontalWritingModeValue::parse(input)) { let vertical = TextEmphasisVerticalWritingModeValue::parse(input)?; Ok(TextEmphasisPosition(horizontal, vertical)) @@ -845,7 +845,7 @@ impl Parse for MozTabSize { context: &ParserContext, input: &mut Parser<'i, 't>, ) -> Result> { - if let Ok(number) = input.r#try(|i| NonNegativeNumber::parse(context, i)) { + if let Ok(number) = input.try(|i| NonNegativeNumber::parse(context, i)) { // Numbers need to be parsed first because `0` must be recognised // as the number `0` and not the length `0px`. return Ok(GenericMozTabSize::Number(number)); diff --git a/components/style/values/specified/transform.rs b/components/style/values/specified/transform.rs index 2a45e1c6e61..c1ffe202a79 100644 --- a/components/style/values/specified/transform.rs +++ b/components/style/values/specified/transform.rs @@ -38,7 +38,7 @@ impl Transform { use style_traits::{Separator, Space}; if input - .r#try(|input| input.expect_ident_matching("none")) + .try(|input| input.expect_ident_matching("none")) .is_ok() { return Ok(generic::Transform(Vec::new())); @@ -106,7 +106,7 @@ impl Transform { }, "translate" => { let sx = specified::LengthOrPercentage::parse(context, input)?; - if input.r#try(|input| input.expect_comma()).is_ok() { + if input.try(|input| input.expect_comma()).is_ok() { let sy = specified::LengthOrPercentage::parse(context, input)?; Ok(generic::TransformOperation::Translate(sx, Some(sy))) } else { @@ -135,7 +135,7 @@ impl Transform { }, "scale" => { let sx = Number::parse(context, input)?; - if input.r#try(|input| input.expect_comma()).is_ok() { + if input.try(|input| input.expect_comma()).is_ok() { let sy = Number::parse(context, input)?; Ok(generic::TransformOperation::Scale(sx, Some(sy))) } else { @@ -191,7 +191,7 @@ impl Transform { }, "skew" => { let ax = specified::Angle::parse_with_unitless(context, input)?; - if input.r#try(|input| input.expect_comma()).is_ok() { + if input.try(|input| input.expect_comma()).is_ok() { let ay = specified::Angle::parse_with_unitless(context, input)?; Ok(generic::TransformOperation::Skew(ax, Some(ay))) } else { @@ -248,17 +248,17 @@ impl Parse for TransformOrigin { ) -> Result> { let parse_depth = |input: &mut Parser| { input - .r#try(|i| Length::parse(context, i)) + .try(|i| Length::parse(context, i)) .unwrap_or(Length::from_px(0.)) }; - match input.r#try(|i| OriginComponent::parse(context, i)) { + match input.try(|i| OriginComponent::parse(context, i)) { Ok(x_origin @ OriginComponent::Center) => { - if let Ok(y_origin) = input.r#try(|i| OriginComponent::parse(context, i)) { + if let Ok(y_origin) = input.try(|i| OriginComponent::parse(context, i)) { let depth = parse_depth(input); return Ok(Self::new(x_origin, y_origin, depth)); } let y_origin = OriginComponent::Center; - if let Ok(x_keyword) = input.r#try(X::parse) { + if let Ok(x_keyword) = input.try(X::parse) { let x_origin = OriginComponent::Side(x_keyword); let depth = parse_depth(input); return Ok(Self::new(x_origin, y_origin, depth)); @@ -267,7 +267,7 @@ impl Parse for TransformOrigin { return Ok(Self::new(x_origin, y_origin, depth)); }, Ok(x_origin) => { - if let Ok(y_origin) = input.r#try(|i| OriginComponent::parse(context, i)) { + if let Ok(y_origin) = input.try(|i| OriginComponent::parse(context, i)) { let depth = parse_depth(input); return Ok(Self::new(x_origin, y_origin, depth)); } @@ -279,12 +279,12 @@ impl Parse for TransformOrigin { } let y_keyword = Y::parse(input)?; let y_origin = OriginComponent::Side(y_keyword); - if let Ok(x_keyword) = input.r#try(X::parse) { + if let Ok(x_keyword) = input.try(X::parse) { let x_origin = OriginComponent::Side(x_keyword); let depth = parse_depth(input); return Ok(Self::new(x_origin, y_origin, depth)); } - if input.r#try(|i| i.expect_ident_matching("center")).is_ok() { + if input.try(|i| i.expect_ident_matching("center")).is_ok() { let x_origin = OriginComponent::Center; let depth = parse_depth(input); return Ok(Self::new(x_origin, y_origin, depth)); @@ -303,10 +303,10 @@ where context: &ParserContext, input: &mut Parser<'i, 't>, ) -> Result> { - if input.r#try(|i| i.expect_ident_matching("center")).is_ok() { + if input.try(|i| i.expect_ident_matching("center")).is_ok() { return Ok(OriginComponent::Center); } - if let Ok(lop) = input.r#try(|i| LengthOrPercentage::parse(context, i)) { + if let Ok(lop) = input.try(|i| LengthOrPercentage::parse(context, i)) { return Ok(OriginComponent::Length(lop)); } let keyword = S::parse(context, input)?; @@ -353,11 +353,11 @@ impl Parse for Rotate { context: &ParserContext, input: &mut Parser<'i, 't>, ) -> Result> { - if input.r#try(|i| i.expect_ident_matching("none")).is_ok() { + if input.try(|i| i.expect_ident_matching("none")).is_ok() { return Ok(generic::Rotate::None); } - if let Ok(rx) = input.r#try(|i| Number::parse(context, i)) { + if let Ok(rx) = input.try(|i| Number::parse(context, i)) { // 'rotate: {3} ' let ry = Number::parse(context, input)?; let rz = Number::parse(context, input)?; @@ -379,13 +379,13 @@ impl Parse for Translate { context: &ParserContext, input: &mut Parser<'i, 't>, ) -> Result> { - if input.r#try(|i| i.expect_ident_matching("none")).is_ok() { + if input.try(|i| i.expect_ident_matching("none")).is_ok() { return Ok(generic::Translate::None); } let tx = specified::LengthOrPercentage::parse(context, input)?; - if let Ok(ty) = input.r#try(|i| specified::LengthOrPercentage::parse(context, i)) { - if let Ok(tz) = input.r#try(|i| specified::Length::parse(context, i)) { + if let Ok(ty) = input.try(|i| specified::LengthOrPercentage::parse(context, i)) { + if let Ok(tz) = input.try(|i| specified::Length::parse(context, i)) { // 'translate: ' return Ok(generic::Translate::Translate3D(tx, ty, tz)); } @@ -410,13 +410,13 @@ impl Parse for Scale { context: &ParserContext, input: &mut Parser<'i, 't>, ) -> Result> { - if input.r#try(|i| i.expect_ident_matching("none")).is_ok() { + if input.try(|i| i.expect_ident_matching("none")).is_ok() { return Ok(generic::Scale::None); } let sx = Number::parse(context, input)?; - if let Ok(sy) = input.r#try(|i| Number::parse(context, i)) { - if let Ok(sz) = input.r#try(|i| Number::parse(context, i)) { + if let Ok(sy) = input.try(|i| Number::parse(context, i)) { + if let Ok(sz) = input.try(|i| Number::parse(context, i)) { // 'scale: ' return Ok(generic::Scale::Scale3D(sx, sy, sz)); } diff --git a/components/style/values/specified/ui.rs b/components/style/values/specified/ui.rs index e3ea599aa4c..5adfcaa7f70 100644 --- a/components/style/values/specified/ui.rs +++ b/components/style/values/specified/ui.rs @@ -32,7 +32,7 @@ impl Parse for Cursor { ) -> Result> { let mut images = vec![]; loop { - match input.r#try(|input| CursorImage::parse(context, input)) { + match input.try(|input| CursorImage::parse(context, input)) { Ok(image) => images.push(image), Err(_) => break, } @@ -64,7 +64,7 @@ impl Parse for CursorImage { ) -> Result> { Ok(Self { url: SpecifiedImageUrl::parse(context, input)?, - hotspot: match input.r#try(|input| Number::parse(context, input)) { + hotspot: match input.try(|input| Number::parse(context, input)) { Ok(number) => Some((number, Number::parse(context, input)?)), Err(_) => None, }, @@ -131,7 +131,7 @@ impl Parse for ScrollbarColor { context: &ParserContext, input: &mut Parser<'i, 't>, ) -> Result> { - if input.r#try(|i| i.expect_ident_matching("auto")).is_ok() { + if input.try(|i| i.expect_ident_matching("auto")).is_ok() { return Ok(generics::ScrollbarColor::Auto); } Ok(generics::ScrollbarColor::Colors { diff --git a/components/style_traits/values.rs b/components/style_traits/values.rs index 575bf5183d9..0fe3ba767c6 100644 --- a/components/style_traits/values.rs +++ b/components/style_traits/values.rs @@ -324,7 +324,7 @@ impl Separator for Space { let mut results = vec![parse_one(input)?]; loop { input.skip_whitespace(); // Unnecessary for correctness, but may help try() rewind less. - if let Ok(item) = input.r#try(&mut parse_one) { + if let Ok(item) = input.try(&mut parse_one) { results.push(item); } else { return Ok(results); @@ -350,9 +350,9 @@ impl Separator for CommaWithSpace { loop { input.skip_whitespace(); // Unnecessary for correctness, but may help try() rewind less. let comma_location = input.current_source_location(); - let comma = input.r#try(|i| i.expect_comma()).is_ok(); + let comma = input.try(|i| i.expect_comma()).is_ok(); input.skip_whitespace(); // Unnecessary for correctness, but may help try() rewind less. - if let Ok(item) = input.r#try(&mut parse_one) { + if let Ok(item) = input.try(&mut parse_one) { results.push(item); } else if comma { return Err(comma_location.new_unexpected_token_error(Token::Comma));