GNOME.org
 

[librsvg: 47/51] Return a BasicParseError from parse_identifiers

commit b08f44927b5858582f4dd7f85b646a27dc37cc57
Author: Federico Mena Quintero <federico gnome org>
Date:   Wed Dec 18 13:40:25 2019 -0600

    Return a BasicParseError from parse_identifiers
    
    This makes error conversions easier.

 rsvg_internals/src/aspect_ratio.rs               | 6 +++---
 rsvg_internals/src/coord_units.rs                | 4 ++--
 rsvg_internals/src/filters/blend.rs              | 2 +-
 rsvg_internals/src/filters/color_matrix.rs       | 2 +-
 rsvg_internals/src/filters/component_transfer.rs | 2 +-
 rsvg_internals/src/filters/composite.rs          | 2 +-
 rsvg_internals/src/filters/convolve_matrix.rs    | 4 ++--
 rsvg_internals/src/filters/displacement_map.rs   | 2 +-
 rsvg_internals/src/filters/morphology.rs         | 2 +-
 rsvg_internals/src/filters/turbulence.rs         | 4 ++--
 rsvg_internals/src/font_props.rs                 | 4 ++--
 rsvg_internals/src/gradient.rs                   | 2 +-
 rsvg_internals/src/marker.rs                     | 2 +-
 rsvg_internals/src/parsers.rs                    | 2 +-
 rsvg_internals/src/property_defs.rs              | 2 +-
 rsvg_internals/src/property_macros.rs            | 2 +-
 16 files changed, 22 insertions(+), 22 deletions(-)
---
diff --git a/rsvg_internals/src/aspect_ratio.rs b/rsvg_internals/src/aspect_ratio.rs
index cf67f173..d0109d61 100644
--- a/rsvg_internals/src/aspect_ratio.rs
+++ b/rsvg_internals/src/aspect_ratio.rs
@@ -28,7 +28,7 @@ use crate::error::*;
 use crate::parsers::Parse;
 use crate::rect::Rect;
 use crate::viewbox::ViewBox;
-use cssparser::Parser;
+use cssparser::{BasicParseError, Parser};
 
 #[derive(Debug, Copy, Clone, PartialEq, Eq)]
 pub struct AspectRatio {
@@ -191,7 +191,7 @@ impl AspectRatio {
     }
 }
 
-fn parse_align_xy<'i>(parser: &mut Parser<'i, '_>) -> Result<Option<(X, Y)>, ParseError<'i>> {
+fn parse_align_xy<'i>(parser: &mut Parser<'i, '_>) -> Result<Option<(X, Y)>, BasicParseError<'i>> {
     use self::Align1D::*;
 
     parse_identifiers!(
@@ -213,7 +213,7 @@ fn parse_align_xy<'i>(parser: &mut Parser<'i, '_>) -> Result<Option<(X, Y)>, Par
     )
 }
 
-fn parse_fit_mode<'i>(parser: &mut Parser<'i, '_>) -> Result<FitMode, ParseError<'i>> {
+fn parse_fit_mode<'i>(parser: &mut Parser<'i, '_>) -> Result<FitMode, BasicParseError<'i>> {
     parse_identifiers!(
         parser,
         "meet" => FitMode::Meet,
diff --git a/rsvg_internals/src/coord_units.rs b/rsvg_internals/src/coord_units.rs
index 266a06d3..0b19b68c 100644
--- a/rsvg_internals/src/coord_units.rs
+++ b/rsvg_internals/src/coord_units.rs
@@ -1,6 +1,6 @@
 //! `userSpaceOnUse` or `objectBoundingBox` values.
 
-use cssparser::Parser;
+use cssparser::{BasicParseError, Parser};
 
 use crate::error::*;
 use crate::parsers::Parse;
@@ -20,7 +20,7 @@ impl Parse for CoordUnits {
             parser,
             "userSpaceOnUse" => CoordUnits::UserSpaceOnUse,
             "objectBoundingBox" => CoordUnits::ObjectBoundingBox,
-        ).map_err(|_: ParseError| ValueErrorKind::parse_error("parse error"))
+        ).map_err(|_: BasicParseError| ValueErrorKind::parse_error("parse error"))
     }
 }
 
diff --git a/rsvg_internals/src/filters/blend.rs b/rsvg_internals/src/filters/blend.rs
index 94e32032..54aa826e 100755
--- a/rsvg_internals/src/filters/blend.rs
+++ b/rsvg_internals/src/filters/blend.rs
@@ -154,7 +154,7 @@ impl Parse for Mode {
             "color" => Mode::HslColor,
             "luminosity" => Mode::HslLuminosity,
         )
-        .map_err(|_: ParseError| ValueErrorKind::parse_error("parse error"))
+        .map_err(|_| ValueErrorKind::parse_error("parse error"))
     }
 }
 
diff --git a/rsvg_internals/src/filters/color_matrix.rs b/rsvg_internals/src/filters/color_matrix.rs
index 0fb1c69a..b5707c0a 100644
--- a/rsvg_internals/src/filters/color_matrix.rs
+++ b/rsvg_internals/src/filters/color_matrix.rs
@@ -240,6 +240,6 @@ impl Parse for OperationType {
             "saturate" => OperationType::Saturate,
             "hueRotate" => OperationType::HueRotate,
             "luminanceToAlpha" => OperationType::LuminanceToAlpha,
-        ).map_err(|_: ParseError| ValueErrorKind::parse_error("parse error"))
+        ).map_err(|_| ValueErrorKind::parse_error("parse error"))
     }
 }
diff --git a/rsvg_internals/src/filters/component_transfer.rs 
b/rsvg_internals/src/filters/component_transfer.rs
index 6f4f8a86..7b7fa298 100644
--- a/rsvg_internals/src/filters/component_transfer.rs
+++ b/rsvg_internals/src/filters/component_transfer.rs
@@ -70,7 +70,7 @@ impl Parse for FunctionType {
             "linear" => FunctionType::Linear,
             "gamma" => FunctionType::Gamma,
         )
-        .map_err(|_: ParseError| ValueErrorKind::parse_error("parse error"))
+        .map_err(|_| ValueErrorKind::parse_error("parse error"))
     }
 }
 
diff --git a/rsvg_internals/src/filters/composite.rs b/rsvg_internals/src/filters/composite.rs
index 4ce7e3a2..738f074f 100644
--- a/rsvg_internals/src/filters/composite.rs
+++ b/rsvg_internals/src/filters/composite.rs
@@ -221,7 +221,7 @@ impl Parse for Operator {
             "atop" => Operator::Atop,
             "xor" => Operator::Xor,
             "arithmetic" => Operator::Arithmetic,
-        ).map_err(|_: ParseError| ValueErrorKind::parse_error("parse error"))
+        ).map_err(|_| ValueErrorKind::parse_error("parse error"))
     }
 }
 
diff --git a/rsvg_internals/src/filters/convolve_matrix.rs b/rsvg_internals/src/filters/convolve_matrix.rs
index 0747ddd8..e036787d 100644
--- a/rsvg_internals/src/filters/convolve_matrix.rs
+++ b/rsvg_internals/src/filters/convolve_matrix.rs
@@ -353,7 +353,7 @@ impl Parse for EdgeMode {
             "wrap" => EdgeMode::Wrap,
             "none" => EdgeMode::None,
         )
-        .map_err(|_: ParseError| ValueErrorKind::parse_error("parse error"))
+        .map_err(|_| ValueErrorKind::parse_error("parse error"))
     }
 }
 
@@ -365,6 +365,6 @@ impl Parse for bool {
             "false" => false,
             "true" => true,
         )
-        .map_err(|_: ParseError| ValueErrorKind::parse_error("parse error"))
+        .map_err(|_| ValueErrorKind::parse_error("parse error"))
     }
 }
diff --git a/rsvg_internals/src/filters/displacement_map.rs b/rsvg_internals/src/filters/displacement_map.rs
index 0d91a897..65ae2939 100644
--- a/rsvg_internals/src/filters/displacement_map.rs
+++ b/rsvg_internals/src/filters/displacement_map.rs
@@ -155,6 +155,6 @@ impl Parse for ColorChannel {
             "B" => ColorChannel::B,
             "A" => ColorChannel::A,
         )
-        .map_err(|_: ParseError| ValueErrorKind::parse_error("parse error"))
+        .map_err(|_| ValueErrorKind::parse_error("parse error"))
     }
 }
diff --git a/rsvg_internals/src/filters/morphology.rs b/rsvg_internals/src/filters/morphology.rs
index a7493024..862d842f 100644
--- a/rsvg_internals/src/filters/morphology.rs
+++ b/rsvg_internals/src/filters/morphology.rs
@@ -165,6 +165,6 @@ impl Parse for Operator {
             "erode" => Operator::Erode,
             "dilate" => Operator::Dilate,
         )
-        .map_err(|_: ParseError| ValueErrorKind::parse_error("parse error"))
+        .map_err(|_| ValueErrorKind::parse_error("parse error"))
     }
 }
diff --git a/rsvg_internals/src/filters/turbulence.rs b/rsvg_internals/src/filters/turbulence.rs
index 62842977..46e9b4ec 100644
--- a/rsvg_internals/src/filters/turbulence.rs
+++ b/rsvg_internals/src/filters/turbulence.rs
@@ -427,7 +427,7 @@ impl Parse for StitchTiles {
             "stitch" => StitchTiles::Stitch,
             "noStitch" => StitchTiles::NoStitch,
         )
-        .map_err(|_: ParseError| ValueErrorKind::parse_error("parse error"))
+        .map_err(|_| ValueErrorKind::parse_error("parse error"))
     }
 }
 
@@ -438,7 +438,7 @@ impl Parse for NoiseType {
             "fractalNoise" => NoiseType::FractalNoise,
             "turbulence" => NoiseType::Turbulence,
         )
-        .map_err(|_: ParseError| ValueErrorKind::parse_error("parse error"))
+        .map_err(|_| ValueErrorKind::parse_error("parse error"))
     }
 }
 
diff --git a/rsvg_internals/src/font_props.rs b/rsvg_internals/src/font_props.rs
index 8e0796ff..e9510942 100644
--- a/rsvg_internals/src/font_props.rs
+++ b/rsvg_internals/src/font_props.rs
@@ -77,7 +77,7 @@ impl Parse for FontSizeSpec {
                     "x-large" => FontSizeSpec::XLarge,
                     "xx-large" => FontSizeSpec::XXLarge,
                 )
-            }).map_err(|_: ParseError| ValueErrorKind::parse_error("parse error"))
+            }).map_err(|_| ValueErrorKind::parse_error("parse error"))
     }
 }
 
@@ -180,7 +180,7 @@ impl Parse for LetterSpacingSpec {
                     parser,
                     "normal" => LetterSpacingSpec::Normal,
                 )
-            }).map_err(|_: ParseError| ValueErrorKind::parse_error("parse error"))
+            }).map_err(|_| ValueErrorKind::parse_error("parse error"))
     }
 }
 
diff --git a/rsvg_internals/src/gradient.rs b/rsvg_internals/src/gradient.rs
index d36e90a6..9c557b9f 100644
--- a/rsvg_internals/src/gradient.rs
+++ b/rsvg_internals/src/gradient.rs
@@ -50,7 +50,7 @@ impl Parse for SpreadMethod {
             "pad" => SpreadMethod::Pad,
             "reflect" => SpreadMethod::Reflect,
             "repeat" => SpreadMethod::Repeat,
-        ).map_err(|_: ParseError| ValueErrorKind::parse_error("parse error"))
+        ).map_err(|_| ValueErrorKind::parse_error("parse error"))
     }
 }
 
diff --git a/rsvg_internals/src/marker.rs b/rsvg_internals/src/marker.rs
index 5d4b2e8e..d3f59840 100644
--- a/rsvg_internals/src/marker.rs
+++ b/rsvg_internals/src/marker.rs
@@ -43,7 +43,7 @@ impl Parse for MarkerUnits {
             "userSpaceOnUse" => MarkerUnits::UserSpaceOnUse,
             "strokeWidth" => MarkerUnits::StrokeWidth,
         )
-        .map_err(|_: ParseError| ValueErrorKind::parse_error("parse error"))
+        .map_err(|_| ValueErrorKind::parse_error("parse error"))
     }
 }
 
diff --git a/rsvg_internals/src/parsers.rs b/rsvg_internals/src/parsers.rs
index 9a6bd17b..52be282f 100644
--- a/rsvg_internals/src/parsers.rs
+++ b/rsvg_internals/src/parsers.rs
@@ -192,7 +192,7 @@ macro_rules! parse_identifiers {
             match token {
                 $(cssparser::Token::Ident(ref cow) if cow.eq_ignore_ascii_case($str) => Ok($val),)+
 
-                _ => Err(loc.new_unexpected_token_error(token.clone()))
+                _ => Err(loc.new_basic_unexpected_token_error(token.clone()))
             }
         }
     };
diff --git a/rsvg_internals/src/property_defs.rs b/rsvg_internals/src/property_defs.rs
index 05fe23b1..1a0b63f1 100644
--- a/rsvg_internals/src/property_defs.rs
+++ b/rsvg_internals/src/property_defs.rs
@@ -53,7 +53,7 @@ make_property!(
                             "sub" => BaselineShift(Length::<Both>::new(-0.2, LengthUnit::Percent)),
 
                             "super" => BaselineShift(Length::<Both>::new(0.4, LengthUnit::Percent)),
-                        ).map_err(|_: ParseError| ValueErrorKind::parse_error("parse error"))
+                        ).map_err(|_| ValueErrorKind::parse_error("parse error"))
                     })
             }
         }
diff --git a/rsvg_internals/src/property_macros.rs b/rsvg_internals/src/property_macros.rs
index 42ff6148..2a79bdeb 100644
--- a/rsvg_internals/src/property_macros.rs
+++ b/rsvg_internals/src/property_macros.rs
@@ -50,7 +50,7 @@ macro_rules! make_property {
                 parse_identifiers!(
                     parser,
                     $($str_prop => $name::$variant,)+
-                ).map_err(|_e: crate::error::ParseError| crate::error::ValueErrorKind::parse_error("parse 
error"))
+                ).map_err(|_| crate::error::ValueErrorKind::parse_error("parse error"))
             }
         }
     };
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]