fixup! WIP make parse_datetime parse longest datetime possible first

jfinkels · jfinkels · commit 805611ab5813 · 2025-01-30T21:54:09.000-05:00
diff --git a/src/lib.rs b/src/lib.rs
@@ -296,7 +296,7 @@ fn parse_reference_date(date: DateTime<Local>, s: &str) -> Option<(DateTime<Fixe
     }
 
     // Weekday only.
-    if let Some(weekday) = parse_weekday::parse_weekday(&s) {
+    if let Some(weekday) = parse_weekday::parse_weekday(s) {
         let now = match date.with_time(NaiveTime::from_hms_opt(0, 0, 0).unwrap()) {
             MappedLocalTime::Single(t) => t,
             _ => return None,
@@ -308,7 +308,7 @@ fn parse_reference_date(date: DateTime<Local>, s: &str) -> Option<(DateTime<Fixe
     }
 
     // Unix timestamp (seconds from `1970-01-01 00:00:00 +0000`).
-    if let Ok(timestamp) = parse_timestamp(&s) {
+    if let Ok(timestamp) = parse_timestamp(s) {
         if let Some(datetime) = DateTime::from_timestamp(timestamp, 0) {
             let n = s.len();
             return Some((datetime.into(), n));
@@ -338,7 +338,7 @@ fn parse_reference_date(date: DateTime<Local>, s: &str) -> Option<(DateTime<Fixe
     }
 
     // Time only.
-    if let Some(date_time) = parse_time_only_str::parse_time_only(date, s.as_ref()) {
+    if let Some(date_time) = parse_time_only_str::parse_time_only(date, s) {
         let n = s.len();
         return Some((date_time, n));
     }

Original file line number	Diff line number	Diff line change
`@@ -296,7 +296,7 @@ fn parse_reference_date(date: DateTime<Local>, s: &str) -> Option<(DateTime<Fixe`
`296`	`296`	`}`
`297`	`297`
`298`	`298`	`// Weekday only.`
`299`		`- if let Some(weekday) = parse_weekday::parse_weekday(&s) {`
	`299`	`+ if let Some(weekday) = parse_weekday::parse_weekday(s) {`
`300`	`300`	`let now = match date.with_time(NaiveTime::from_hms_opt(0, 0, 0).unwrap()) {`
`301`	`301`	`MappedLocalTime::Single(t) => t,`
`302`	`302`	`_ => return None,`
`@@ -308,7 +308,7 @@ fn parse_reference_date(date: DateTime<Local>, s: &str) -> Option<(DateTime<Fixe`
`308`	`308`	`}`
`309`	`309`
`310`	`310`	// Unix timestamp (seconds from `1970-01-01 00:00:00 +0000`).
`311`		`- if let Ok(timestamp) = parse_timestamp(&s) {`
	`311`	`+ if let Ok(timestamp) = parse_timestamp(s) {`
`312`	`312`	`if let Some(datetime) = DateTime::from_timestamp(timestamp, 0) {`
`313`	`313`	`let n = s.len();`
`314`	`314`	`return Some((datetime.into(), n));`
`@@ -338,7 +338,7 @@ fn parse_reference_date(date: DateTime<Local>, s: &str) -> Option<(DateTime<Fixe`
`338`	`338`	`}`
`339`	`339`
`340`	`340`	`// Time only.`
`341`		`- if let Some(date_time) = parse_time_only_str::parse_time_only(date, s.as_ref()) {`
	`341`	`+ if let Some(date_time) = parse_time_only_str::parse_time_only(date, s) {`
`342`	`342`	`let n = s.len();`
`343`	`343`	`return Some((date_time, n));`
`344`	`344`	`}`