[librsvg] parses_stroke_dasharray() - Don't use discriminant checks; use PartialEq comparisons



commit 28ea3cb7d35df40acbc014b7797830ed274895c6
Author: Federico Mena Quintero <federico gnome org>
Date:   Fri Feb 23 15:04:12 2018 -0600

    parses_stroke_dasharray() - Don't use discriminant checks; use PartialEq comparisons
    
    The code is prettier this way, and doesn't require Rust 1.21.

 rsvg_internals/src/length.rs | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)
---
diff --git a/rsvg_internals/src/length.rs b/rsvg_internals/src/length.rs
index 8326e7f2..9b2c8e6e 100644
--- a/rsvg_internals/src/length.rs
+++ b/rsvg_internals/src/length.rs
@@ -311,7 +311,7 @@ pub struct RsvgStrokeDasharray {
     pub dashes: *mut RsvgLength
 }
 
-#[derive(Debug)]
+#[derive(Debug, PartialEq)]
 enum StrokeDasharray {
     None,
     Inherit,
@@ -542,12 +542,10 @@ mod tests {
 
     #[test]
     fn parses_stroke_dasharray() {
-        use std::mem::discriminant;
-
-        // https://doc.rust-lang.org/std/mem/fn.discriminant.html
-        assert_eq!(discriminant(&parse_stroke_dash_array("none").unwrap()), 
discriminant(&StrokeDasharray::None));
-        assert_eq!(discriminant(&parse_stroke_dash_array("inherit").unwrap()), 
discriminant(&StrokeDasharray::Inherit));
-        assert_eq!(discriminant(&parse_stroke_dash_array("10, 5").unwrap()), 
discriminant(&StrokeDasharray::Dasharray(parse_dash_array("10, 5").unwrap())));
+        assert_eq!(parse_stroke_dash_array("none").unwrap(), StrokeDasharray::None);
+        assert_eq!(parse_stroke_dash_array("inherit").unwrap(), StrokeDasharray::Inherit);
+        assert_eq!(parse_stroke_dash_array("10, 5").unwrap(),
+                   StrokeDasharray::Dasharray(parse_dash_array("10, 5").unwrap()));
         assert!(parse_stroke_dash_array("").is_err());
     }
 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]