Remove hack to accept "UTC" in timezone_offset_zulu

chronotope · Aug 28, 2023 · a02d495 · a02d495
1 parent 814d17b
commit a02d495
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 21 deletions.
diff --git a/src/format/parse.rs b/src/format/parse.rs
@@ -559,7 +559,6 @@ fn parse_rfc3339_relaxed<'a>(parsed: &mut Parsed, mut s: &'a str) -> ParseResult
         Item::Numeric(Numeric::Second, Pad::Zero),
         Item::Fixed(Fixed::Nanosecond),
         Item::Space(""),
-        Item::Fixed(Fixed::TimezoneOffsetZ),
     ];
 
     s = match parse_internal(parsed, s, DATE_ITEMS.iter()) {
@@ -574,11 +573,19 @@ fn parse_rfc3339_relaxed<'a>(parsed: &mut Parsed, mut s: &'a str) -> ParseResult
         None => return Err(TOO_SHORT),
     };
 
-    match parse_internal(parsed, s, TIME_ITEMS.iter()) {
-        Err((s, e)) if e.0 == ParseErrorKind::TooLong => Ok((s, ())),
-        Err((_s, e)) => Err(e),
-        Ok(s) => Ok((s, ())),
-    }
+    s = match parse_internal(parsed, s, TIME_ITEMS.iter()) {
+        Err((s, e)) if e.0 == ParseErrorKind::TooLong => s,
+        Err((_s, e)) => return Err(e),
+        Ok(_) => return Err(NOT_ENOUGH),
+    };
+    s = s.trim_start();
+    let (s, offset) = if s.starts_with("UTC") || s.starts_with("utc") {
+        (&s[3..], 0)
+    } else {
+        scan::timezone_offset(s, scan::colon_or_space, true, false, true)?
+    };
+    parsed.set_offset(i64::from(offset))?;
+    Ok((s, ()))
 }
 
 #[cfg(test)]

diff --git a/src/format/scan.rs b/src/format/scan.rs
@@ -210,21 +210,8 @@ where
     F: FnMut(&str) -> ParseResult<&str>,
 {
     if allow_zulu {
-        let bytes = s.as_bytes();
-        match bytes.first() {
-            Some(&b'z') | Some(&b'Z') => return Ok((&s[1..], 0)),
-            Some(&b'u') | Some(&b'U') => {
-                if bytes.len() >= 3 {
-                    let (b, c) = (bytes[1], bytes[2]);
-                    match (b | 32, c | 32) {
-                        (b't', b'c') => return Ok((&s[3..], 0)),
-                        _ => return Err(INVALID),
-                    }
-                } else {
-                    return Err(INVALID);
-                }
-            }
-            _ => {}
+        if let Some(&b'Z' | &b'z') = s.as_bytes().first() {
+            return Ok((&s[1..], 0));
         }
     }