[librsvg: 2/4] Use cssparser.try_parse() instead of r#try

[Federico Mena Quintero <federico src gnome org>]

commit 462463971684b7ac9a790470c2a41031c01a3408
Author: Federico Mena Quintero <federico gnome org>
Date:   Tue Apr 30 09:04:23 2019 -0500

    Use cssparser.try_parse() instead of r#try

 rsvg_internals/src/aspect_ratio.rs | 6 +++---
 rsvg_internals/src/font_props.rs   | 6 +++---
 rsvg_internals/src/iri.rs          | 2 +-
 rsvg_internals/src/length.rs       | 4 ++--
 rsvg_internals/src/marker.rs       | 2 +-
 rsvg_internals/src/paint_server.rs | 8 ++++----
 rsvg_internals/src/parsers.rs      | 2 +-
 rsvg_internals/src/properties.rs   | 2 +-
 rsvg_internals/src/transform.rs    | 6 +++---
 9 files changed, 19 insertions(+), 19 deletions(-)
---
diff --git a/rsvg_internals/src/aspect_ratio.rs b/rsvg_internals/src/aspect_ratio.rs
index 4ed6ff61..7795f821 100644
--- a/rsvg_internals/src/aspect_ratio.rs
+++ b/rsvg_internals/src/aspect_ratio.rs
@@ -222,16 +222,16 @@ impl Parse for AspectRatio {
     type Err = ValueErrorKind;
 
     fn parse(parser: &mut Parser<'_, '_>) -> Result<AspectRatio, ValueErrorKind> {
-        let defer = parser.r#try(|p| p.expect_ident_matching("defer")).is_ok();
+        let defer = parser.try_parse(|p| p.expect_ident_matching("defer")).is_ok();
 
-        let align_xy = parser.r#try(|p| {
+        let align_xy = parser.try_parse(|p| {
             p.expect_ident()
                 .map_err(|_| ValueErrorKind::Parse(ParseError::new("expected identifier")))
                 .and_then(|ident| parse_align_xy(ident))
         })?;
 
         let fit = parser
-            .r#try(|p| {
+            .try_parse(|p| {
                 p.expect_ident()
                     .map_err(|_| ValueErrorKind::Parse(ParseError::new("expected identifier")))
                     .and_then(|ident| parse_fit_mode(ident))
diff --git a/rsvg_internals/src/font_props.rs b/rsvg_internals/src/font_props.rs
index 6d964d19..7461842f 100644
--- a/rsvg_internals/src/font_props.rs
+++ b/rsvg_internals/src/font_props.rs
@@ -121,7 +121,7 @@ impl Parse for FontWeightSpec {
     type Err = ValueErrorKind;
 
     fn parse(parser: &mut Parser<'_, '_>) -> Result<FontWeightSpec, crate::error::ValueErrorKind> {
-        if let Ok(r) = parser.r#try(|p| {
+        if let Ok(r) = parser.try_parse(|p| {
             p.expect_ident()
                 .map_err(|_| ())
                 .and_then(|cow| match cow.as_ref() {
@@ -240,7 +240,7 @@ impl Parse for SingleFontFamily {
 fn parse_single_font_family<'i>(
     parser: &'i mut Parser<'_, '_>,
 ) -> Result<SingleFontFamily, BasicParseError<'i>> {
-    if let Ok(cow) = parser.r#try(|p| p.expect_string_cloned()) {
+    if let Ok(cow) = parser.try_parse(|p| p.expect_string_cloned()) {
         return Ok(SingleFontFamily((*cow).to_owned()));
     }
 
@@ -248,7 +248,7 @@ fn parse_single_font_family<'i>(
 
     let mut value = first_ident.as_ref().to_owned();
 
-    while let Ok(cow) = parser.r#try(|p| p.expect_ident_cloned()) {
+    while let Ok(cow) = parser.try_parse(|p| p.expect_ident_cloned()) {
         value.push(' ');
         value.push_str(&cow);
     }
diff --git a/rsvg_internals/src/iri.rs b/rsvg_internals/src/iri.rs
index 7e785891..6191f5ca 100644
--- a/rsvg_internals/src/iri.rs
+++ b/rsvg_internals/src/iri.rs
@@ -36,7 +36,7 @@ impl Parse for IRI {
     type Err = ParseError;
 
     fn parse(parser: &mut Parser<'_, '_>) -> Result<IRI, ParseError> {
-        if parser.r#try(|i| i.expect_ident_matching("none")).is_ok() {
+        if parser.try_parse(|i| i.expect_ident_matching("none")).is_ok() {
             Ok(IRI::None)
         } else {
             let url = parser
diff --git a/rsvg_internals/src/length.rs b/rsvg_internals/src/length.rs
index 73540406..721f8905 100644
--- a/rsvg_internals/src/length.rs
+++ b/rsvg_internals/src/length.rs
@@ -360,7 +360,7 @@ impl Parse for Dasharray {
     type Err = ValueErrorKind;
 
     fn parse(parser: &mut Parser<'_, '_>) -> Result<Dasharray, ValueErrorKind> {
-        if parser.r#try(|p| p.expect_ident_matching("none")).is_ok() {
+        if parser.try_parse(|p| p.expect_ident_matching("none")).is_ok() {
             Ok(Dasharray::None)
         } else {
             Ok(Dasharray::Array(parse_dash_array(parser)?))
@@ -377,7 +377,7 @@ fn parse_dash_array(parser: &mut Parser<'_, '_>) -> Result<Vec<LengthBoth>, Valu
 
         if parser.is_exhausted() {
             break;
-        } else if parser.r#try(|p| p.expect_comma()).is_ok() {
+        } else if parser.try_parse(|p| p.expect_comma()).is_ok() {
             continue;
         }
     }
diff --git a/rsvg_internals/src/marker.rs b/rsvg_internals/src/marker.rs
index 97fa7a27..b6ace005 100644
--- a/rsvg_internals/src/marker.rs
+++ b/rsvg_internals/src/marker.rs
@@ -77,7 +77,7 @@ impl Parse for MarkerOrient {
     type Err = ValueErrorKind;
 
     fn parse(parser: &mut Parser<'_, '_>) -> Result<MarkerOrient, ValueErrorKind> {
-        if parser.r#try(|p| p.expect_ident_matching("auto")).is_ok() {
+        if parser.try_parse(|p| p.expect_ident_matching("auto")).is_ok() {
             Ok(MarkerOrient::Auto)
         } else {
             Angle::parse(parser).map(MarkerOrient::Angle)
diff --git a/rsvg_internals/src/paint_server.rs b/rsvg_internals/src/paint_server.rs
index 1060cdf6..bd8eb45a 100644
--- a/rsvg_internals/src/paint_server.rs
+++ b/rsvg_internals/src/paint_server.rs
@@ -23,14 +23,14 @@ impl Parse for PaintServer {
     type Err = ValueErrorKind;
 
     fn parse(parser: &mut Parser<'_, '_>) -> Result<PaintServer, ValueErrorKind> {
-        if parser.r#try(|i| i.expect_ident_matching("none")).is_ok() {
+        if parser.try_parse(|i| i.expect_ident_matching("none")).is_ok() {
             Ok(PaintServer::None)
-        } else if let Ok(url) = parser.r#try(|i| i.expect_url()) {
+        } else if let Ok(url) = parser.try_parse(|i| i.expect_url()) {
             let alternate = if !parser.is_exhausted() {
-                if parser.r#try(|i| i.expect_ident_matching("none")).is_ok() {
+                if parser.try_parse(|i| i.expect_ident_matching("none")).is_ok() {
                     None
                 } else {
-                    Some(parser.r#try(|i| cssparser::Color::parse(i))?)
+                    Some(parser.try_parse(|i| cssparser::Color::parse(i))?)
                 }
             } else {
                 None
diff --git a/rsvg_internals/src/parsers.rs b/rsvg_internals/src/parsers.rs
index e245cec1..ccb3547d 100644
--- a/rsvg_internals/src/parsers.rs
+++ b/rsvg_internals/src/parsers.rs
@@ -53,7 +53,7 @@ impl<'i, 't> CssParserExt for Parser<'i, 't> {
     }
 
     fn optional_comma(&mut self) {
-        let _ = self.r#try(|p| p.expect_comma());
+        let _ = self.try_parse(|p| p.expect_comma());
     }
 }
 
diff --git a/rsvg_internals/src/properties.rs b/rsvg_internals/src/properties.rs
index 8cec8479..c3ece28c 100644
--- a/rsvg_internals/src/properties.rs
+++ b/rsvg_internals/src/properties.rs
@@ -1127,7 +1127,7 @@ make_property!(
                 let mut underline = false;
                 let mut strike = false;
 
-                if parser.r#try(|p| p.expect_ident_matching("none")).is_ok() {
+                if parser.try_parse(|p| p.expect_ident_matching("none")).is_ok() {
                     return Ok(TextDecoration::default());
                 }
 
diff --git a/rsvg_internals/src/transform.rs b/rsvg_internals/src/transform.rs
index c223f378..3e39590e 100644
--- a/rsvg_internals/src/transform.rs
+++ b/rsvg_internals/src/transform.rs
@@ -118,7 +118,7 @@ fn parse_translate_args(parser: &mut Parser<'_, '_>) -> Result<cairo::Matrix, Va
             let tx = p.expect_number()?;
 
             let ty = p
-                .r#try(|p| -> Result<f32, CssParseError<'_, ()>> {
+                .try_parse(|p| -> Result<f32, CssParseError<'_, ()>> {
                     p.optional_comma();
                     Ok(p.expect_number()?)
                 })
@@ -142,7 +142,7 @@ fn parse_scale_args(parser: &mut Parser<'_, '_>) -> Result<cairo::Matrix, ValueE
             let x = p.expect_number()?;
 
             let y = p
-                .r#try(|p| -> Result<f32, CssParseError<'_, ()>> {
+                .try_parse(|p| -> Result<f32, CssParseError<'_, ()>> {
                     p.optional_comma();
                     Ok(p.expect_number()?)
                 })
@@ -166,7 +166,7 @@ fn parse_rotate_args(parser: &mut Parser<'_, '_>) -> Result<cairo::Matrix, Value
             let angle = p.expect_number()?;
 
             let (tx, ty) = p
-                .r#try(|p| -> Result<_, CssParseError<'_, ()>> {
+                .try_parse(|p| -> Result<_, CssParseError<'_, ()>> {
                     p.optional_comma();
                     let tx = p.expect_number()?;