[librsvg: 28/35] parse_length: don't just parse ULength

[Marge Bot <marge-bot src gnome org>]

commit db179918a7a9217cb717cfdba314031a22fa46fd
Author: Federico Mena Quintero <federico gnome org>
Date:   Thu Jun 17 12:50:15 2021 -0500

    parse_length: don't just parse ULength
    
    Part-of: <https://gitlab.gnome.org/GNOME/librsvg/-/merge_requests/547>

 src/bin/rsvg-convert.rs | 6 +++---
 src/lib.rs              | 3 ++-
 2 files changed, 5 insertions(+), 4 deletions(-)
---
diff --git a/src/bin/rsvg-convert.rs b/src/bin/rsvg-convert.rs
index e8c6acec..797bbdbb 100644
--- a/src/bin/rsvg-convert.rs
+++ b/src/bin/rsvg-convert.rs
@@ -21,7 +21,7 @@ mod windows_imports {
 use self::windows_imports::*;
 
 use librsvg::rsvg_convert_only::{
-    Dpi, Horizontal, LegacySize, Normalize, NormalizeParams, PathOrUrl, ULength, Vertical,
+    CssLength, Dpi, Horizontal, LegacySize, Normalize, NormalizeParams, PathOrUrl, ULength, Validate, 
Vertical,
 };
 use librsvg::{
     AcceptLanguage, CairoRenderer, Color, Language, LengthUnit, Loader, Parse, RenderingError,
@@ -993,8 +993,8 @@ fn is_absolute_unit(u: LengthUnit) -> bool {
     }
 }
 
-fn parse_length<N: Normalize>(s: String) -> Result<ULength<N>, clap::Error> {
-    <ULength<N> as Parse>::parse_str(&s)
+fn parse_length<N: Normalize, V: Validate>(s: String) -> Result<CssLength<N, V>, clap::Error> {
+    <CssLength<N, V> as Parse>::parse_str(&s)
         .map_err(|_| {
             let desc = format!(
                 "Invalid value: The argument '{}' can not be parsed as a length",
diff --git a/src/lib.rs b/src/lib.rs
index 3e80ae82..681d67e6 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -251,5 +251,6 @@ pub mod rsvg_convert_only {
     pub use crate::c_api::handle::PathOrUrl;
     pub use crate::c_api::sizing::LegacySize;
     pub use crate::dpi::Dpi;
-    pub use crate::length::{Horizontal, Normalize, NormalizeParams, ULength, Validate, Vertical};
+    pub use crate::error::ParseError;
+    pub use crate::length::{CssLength, Horizontal, Length, Normalize, NormalizeParams, ULength, Validate, 
Vertical};
 }