fix tests and formatting to comply with dtolnay#196

Author: hone

src/version_req.rs

@@ -529,7 +529,7 @@ impl fmt::Display for Predicate {
     fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result {
         write!(
             fmt,
-            "{} {}.{}.{}",
+            "{}{}.{}.{}",
             self.op, self.major, self.minor, self.patch
         )?;
 
@@ -615,7 +615,7 @@ mod test {
     fn test_parsing_default_node() {
         let r = req_node("1.0.0");
 
-        assert_eq!(r.to_string(), "= 1.0.0".to_string());
+        assert_eq!(r.to_string(), "=1.0.0".to_string());
 
         assert_match(&r, &["1.0.0"]);
         assert_not_match(&r, &["0.9.9", "0.10.0", "0.1.0", "1.0.1"]);
@@ -742,27 +742,27 @@ mod test {
     #[test]
     pub fn test_multiple_node() {
         let r = req_node("> 0.0.9, <= 2.5.3");
-        assert_eq!(r.to_string(), "> 0.0.9 <= 2.5.3".to_string());
+        assert_eq!(r.to_string(), ">0.0.9 <=2.5.3".to_string());
         assert_match(&r, &["0.0.10", "1.0.0", "2.5.3"]);
         assert_not_match(&r, &["0.0.8", "2.5.4"]);
 
         let r = req_node("0.3.0, 0.4.0");
-        assert_eq!(r.to_string(), "= 0.3.0 = 0.4.0".to_string());
+        assert_eq!(r.to_string(), "=0.3.0 =0.4.0".to_string());
         assert_not_match(&r, &["0.0.8", "0.3.0", "0.4.0"]);
 
         let r = req_node("<= 0.2.0, >= 0.5.0");
-        assert_eq!(r.to_string(), "<= 0.2.0 >= 0.5.0".to_string());
+        assert_eq!(r.to_string(), "<=0.2.0 >=0.5.0".to_string());
         assert_not_match(&r, &["0.0.8", "0.3.0", "0.5.1"]);
 
         let r = req_node("0.1.0, 0.1.4, 0.1.6");
-        assert_eq!(r.to_string(), "= 0.1.0 = 0.1.4 = 0.1.6".to_string());
+        assert_eq!(r.to_string(), "=0.1.0 =0.1.4 =0.1.6".to_string());
         assert_not_match(&r, &["0.1.0", "0.1.4", "0.1.6", "0.2.0"]);
 
         assert!(VersionReq::parse("> 0.1.0,").is_err());
         assert!(VersionReq::parse("> 0.3.0, ,").is_err());
 
         let r = req_node(">=0.5.1-alpha3, <0.6");
-        assert_eq!(r.to_string(), ">= 0.5.1-alpha3 < 0.6.0".to_string());
+        assert_eq!(r.to_string(), ">=0.5.1-alpha3 <0.6.0".to_string());
         assert_match(
             &r,
             &[
@@ -910,20 +910,20 @@ mod test {
     #[test]
     pub fn test_parsing_logical_or() {
         let r = req("=1.2.3 || =2.3.4");
-        assert_eq!(r.to_string(), "= 1.2.3 || = 2.3.4".to_string());
+        assert_eq!(r.to_string(), "=1.2.3 || =2.3.4".to_string());
         assert_match(&r, &["1.2.3", "2.3.4"]);
         assert_not_match(&r, &["1.0.0", "2.9.0", "0.1.4"]);
         assert_not_match(&r, &["1.2.3-beta1", "2.3.4-alpha", "1.2.3-pre"]);
 
         let r = req("1.1 || =1.2.3");
-        assert_eq!(r.to_string(), ">= 1.1.0, < 1.2.0 || = 1.2.3".to_string());
+        assert_eq!(r.to_string(), ">=1.1.0, <1.2.0 || =1.2.3".to_string());
         assert_match(&r, &["1.1.0", "1.1.12", "1.2.3"]);
         assert_not_match(&r, &["1.0.0", "1.2.2", "1.3.0"]);
 
         let r = req("6.* || 8.* || >= 10.*");
         assert_eq!(
             r.to_string(),
-            ">= 6.0.0, < 7.0.0 || >= 8.0.0, < 9.0.0 || >= 10.0.0".to_string()
+            ">=6.0.0, <7.0.0 || >=8.0.0, <9.0.0 || >=10.0.0".to_string()
         );
         assert_match(&r, &["6.0.0", "6.1.2"]);
         assert_match(&r, &["8.0.0", "8.2.4"]);
@@ -934,20 +934,20 @@ mod test {
     #[test]
     pub fn test_parsing_logical_or_node() {
         let r = req_node("=1.2.3 || =2.3.4");
-        assert_eq!(r.to_string(), "= 1.2.3 || = 2.3.4".to_string());
+        assert_eq!(r.to_string(), "=1.2.3 || =2.3.4".to_string());
         assert_match(&r, &["1.2.3", "2.3.4"]);
         assert_not_match(&r, &["1.0.0", "2.9.0", "0.1.4"]);
         assert_not_match(&r, &["1.2.3-beta1", "2.3.4-alpha", "1.2.3-pre"]);
 
         let r = req_node("1.1 || =1.2.3");
-        assert_eq!(r.to_string(), ">= 1.1.0 < 1.2.0 || = 1.2.3".to_string());
+        assert_eq!(r.to_string(), ">=1.1.0 <1.2.0 || =1.2.3".to_string());
         assert_match(&r, &["1.1.0", "1.1.12", "1.2.3"]);
         assert_not_match(&r, &["1.0.0", "1.2.2", "1.3.0"]);
 
         let r = req_node("6.* || 8.* || >= 10.*");
         assert_eq!(
             r.to_string(),
-            ">= 6.0.0 < 7.0.0 || >= 8.0.0 < 9.0.0 || >= 10.0.0".to_string()
+            ">=6.0.0 <7.0.0 || >=8.0.0 <9.0.0 || >=10.0.0".to_string()
         );
         assert_match(&r, &["6.0.0", "6.1.2"]);
         assert_match(&r, &["8.0.0", "8.2.4"]);