[librsvg] viewbox.rs: Trim whitespace before parsing the viewBox string
- From: Federico Mena Quintero <federico src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [librsvg] viewbox.rs: Trim whitespace before parsing the viewBox string
- Date: Mon, 27 Feb 2017 13:39:23 +0000 (UTC)
commit 98f21cd6a33879df078d141b98055472bd2e66b9
Author: Federico Mena Quintero <federico gnome org>
Date: Mon Feb 27 07:20:59 2017 -0600
viewbox.rs: Trim whitespace before parsing the viewBox string
It seems like it will be easier to trim surrounding whitespace before
calling nom, than doing it in nom itself.
rust/src/viewbox.rs | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
---
diff --git a/rust/src/viewbox.rs b/rust/src/viewbox.rs
index fdef9c5..d94bf43 100644
--- a/rust/src/viewbox.rs
+++ b/rust/src/viewbox.rs
@@ -55,7 +55,7 @@ impl FromStr for RsvgViewBox {
type Err = ParseViewBoxError;
fn from_str (s: &str) -> Result<RsvgViewBox, ParseViewBoxError> {
- let result = parsers::view_box (s.as_bytes ()).to_full_result ();
+ let result = parsers::view_box (s.trim ().as_bytes ()).to_full_result ();
match result {
Ok ((x, y, w, h)) => {
@@ -84,14 +84,14 @@ mod tests {
#[test]
fn parses_valid_viewboxes () {
- assert_eq! (RsvgViewBox::from_str ("1 2 3 4"),
+ assert_eq! (RsvgViewBox::from_str (" 1 2 3 4"),
Ok (RsvgViewBox { rect: cairo::Rectangle { x: 1.0,
y: 2.0,
width: 3.0,
height: 4.0 },
active: true }));
- assert_eq! (RsvgViewBox::from_str ("-1.5 -2.5e1,34,56e2"),
+ assert_eq! (RsvgViewBox::from_str (" -1.5 -2.5e1,34,56e2 "),
Ok (RsvgViewBox { rect: cairo::Rectangle { x: -1.5,
y: -25.0,
width: 34.0,
@@ -104,13 +104,13 @@ mod tests {
assert_eq! (RsvgViewBox::from_str (""),
Err (ParseViewBoxError::Error));
- assert_eq! (RsvgViewBox::from_str ("1,2,-3,-4"),
+ assert_eq! (RsvgViewBox::from_str (" 1,2,-3,-4 "),
Err (ParseViewBoxError::NegativeWidthOrHeight));
assert_eq! (RsvgViewBox::from_str ("qwerasdfzxcv"),
Err (ParseViewBoxError::Error));
- assert_eq! (RsvgViewBox::from_str ("1 2 3 4 5"),
+ assert_eq! (RsvgViewBox::from_str (" 1 2 3 4 5"),
Err (ParseViewBoxError::Error));
}
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]