datetime_from_str is exact about whitespace

`format/parse.rs:datetime_from_str` is exact about whitespace in the passed data `s` and passed strftime format `fmt` Issue chronotope#660
jtmoon79 · Aug 22, 2022 · fbb7ddf · fbb7ddf
1 parent cd6d42b
commit fbb7ddf
Show file tree

Hide file tree

Showing 2 changed files with 88 additions and 12 deletions.
diff --git a/src/datetime/tests.rs b/src/datetime/tests.rs
@@ -206,19 +206,62 @@ fn test_datetime_from_str() {
 }
 
 #[test]
-fn test_datetime_parse_from_str() {
-    let ymdhms = |y, m, d, h, n, s, off| FixedOffset::east(off).ymd(y, m, d).and_hms(h, n, s);
+fn test_datetime_from_str_with_spaces() {
+    // should succeed
     assert_eq!(
-        DateTime::parse_from_str("2014-5-7T12:34:56+09:30", "%Y-%m-%dT%H:%M:%S%z"),
-        Ok(ymdhms(2014, 5, 7, 12, 34, 56, 570 * 60))
-    ); // ignore offset
-    assert!(DateTime::parse_from_str("20140507000000", "%Y%m%d%H%M%S").is_err()); // no offset
-    assert!(DateTime::parse_from_str("Fri, 09 Aug 2013 23:54:35 GMT", "%a, %d %b %Y %H:%M:%S GMT")
-        .is_err());
+        Utc.datetime_from_str(" Aug 09 2013 23:54:35", " %b %d %Y %H:%M:%S"),
+        Ok(Utc.ymd(2013, 8, 9).and_hms(23, 54, 35)),
+    );
+    assert_eq!(
+        Utc.datetime_from_str("Aug 09 2013 23:54:35 ", "%b %d %Y %H:%M:%S "),
+        Ok(Utc.ymd(2013, 8, 9).and_hms(23, 54, 35)),
+    );
+    assert_eq!(
+        Utc.datetime_from_str(" Aug 09 2013 23:54:35 ", " %b %d %Y %H:%M:%S "),
+        Ok(Utc.ymd(2013, 8, 9).and_hms(23, 54, 35)),
+    );
+    assert_eq!(
+        Utc.datetime_from_str("  Aug 09 2013 23:54:35", "  %b %d %Y %H:%M:%S"),
+        Ok(Utc.ymd(2013, 8, 9).and_hms(23, 54, 35)),
+    );
+    assert_eq!(
+        Utc.datetime_from_str("   Aug 09 2013 23:54:35", "   %b %d %Y %H:%M:%S"),
+        Ok(Utc.ymd(2013, 8, 9).and_hms(23, 54, 35)),
+    );
+    assert_eq!(
+        Utc.datetime_from_str("\tAug 09 2013 23:54:35", "\t%b %d %Y %H:%M:%S"),
+        Ok(Utc.ymd(2013, 8, 9).and_hms(23, 54, 35)),
+    );
+    assert_eq!(
+        Utc.datetime_from_str("\tAug 09 2013 23:54:35\t", "\t%b %d %Y %H:%M:%S\t"),
+        Ok(Utc.ymd(2013, 8, 9).and_hms(23, 54, 35)),
+    );
+    assert_eq!(
+        Utc.datetime_from_str("Aug  09 2013 23:54:35", "%b  %d %Y %H:%M:%S"),
+        Ok(Utc.ymd(2013, 8, 9).and_hms(23, 54, 35)),
+    );
+    assert_eq!(
+        Utc.datetime_from_str("Aug    09 2013 23:54:35", "%b    %d %Y %H:%M:%S"),
+        Ok(Utc.ymd(2013, 8, 9).and_hms(23, 54, 35)),
+    );
+
+    assert_eq!(
+        Utc.datetime_from_str("Aug  09 2013\t23:54:35", "%b  %d %Y\t%H:%M:%S"),
+        Ok(Utc.ymd(2013, 8, 9).and_hms(23, 54, 35)),
+    );
+
     assert_eq!(
-        Utc.datetime_from_str("Fri, 09 Aug 2013 23:54:35 GMT", "%a, %d %b %Y %H:%M:%S GMT"),
-        Ok(Utc.ymd(2013, 8, 9).and_hms(23, 54, 35))
+        Utc.datetime_from_str("Aug  09 2013\t\t23:54:35", "%b  %d %Y\t\t%H:%M:%S"),
+        Ok(Utc.ymd(2013, 8, 9).and_hms(23, 54, 35)),
     );
+    // should fail
+    assert!(Utc.datetime_from_str(" Aug 09 2013 23:54:35", "%b %d %Y %H:%M:%S").is_err());
+    assert!(Utc.datetime_from_str("Aug 09 2013 23:54:35", " %b %d %Y %H:%M:%S").is_err());
+    assert!(Utc.datetime_from_str("Aug 09 2013 23:54:35\t", "%b %d %Y %H:%M:%S").is_err());
+    assert!(Utc.datetime_from_str("Aug 09 2013 23:54:35", "%b %d %Y %H:%M:%S\n").is_err());
+    assert!(Utc.datetime_from_str("\nAug 09 2013 23:54:35", "%b %d %Y %H:%M:%S\n").is_err());
+    assert!(Utc.datetime_from_str("Aug 09 2013 23:54:35 ", "%b %d %Y %H:%M:%S\n").is_err());
+    assert!(Utc.datetime_from_str("Aug 09 2013 23:54:35 ", "%b %d %Y\t%H:%M:%S").is_err());
 }
 
 #[test]

diff --git a/src/format/parse.rs b/src/format/parse.rs
@@ -292,8 +292,41 @@ where
                 s = &s[prefix.len()..];
             }
 
-            Item::Space(_) => {
-                s = s.trim_left();
+            Item::Space(space) => {
+                eprintln!("match Item::Space({:?})", space);
+                eprintln!("            s {:?}", s);
+                eprint!("                match s.chars().next() ");
+                match &s.chars().next() {
+                    Some(c) => {
+                        eprintln!("c {:?}", c);
+                        if ! c.is_whitespace() {
+                            // `s` whitespace must match each `item`
+                            eprintln!("\n    ~~Err(INVALID, {:?})", s);
+                            return Err((s, INVALID));
+                        }
+                        // whitespace character must match
+                        match &space.chars().next() {
+                            Some(spacec) => {
+                                if c != spacec {
+                                    eprintln!("\n    ~~Err(INVALID, {:?})", s);
+                                    return Err((s, INVALID));
+                                }
+                            }
+                            None => {
+                                eprintln!("\n    ~~Err(INVALID, {:?})", s);
+                                return Err((s, INVALID));
+                            }
+                        }
+                        s = &s[1..];
+                    },
+                    None => {
+                        eprintln!("None");
+                        // `s` whitespace must match each `items`
+                        eprintln!("\n    ~~Err(INVALID, {:?})", s);
+                        return Err((s, INVALID));
+                    }
+                }
+                eprintln!("            s {:?}", s);
             }
 
             #[cfg(any(feature = "alloc", feature = "std", test))]