Skip to content

Don't use Durations for calculating relative times #85

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
cakebaker merged 6 commits into from
Sep 17, 2024
Merged

Don't use Durations for calculating relative times #85

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
d4f67bb
Don't use Durations for calculating relative times
ysthakur Aug 27, 2024
d75338a
Make tests for months without 30 days and leap years
ysthakur Aug 27, 2024
ced645a
Make helpers timezone-generic
ysthakur Aug 28, 2024
5e6bddb
Get rid of parse_relative_time
ysthakur Aug 28, 2024
d5015a6
Format
ysthakur Aug 28, 2024
e41e26f
Replace unnecessary return with None
ysthakur Sep 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 3 additions & 7 deletions src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ use chrono::{
Timelike,
};

use parse_relative_time::parse_relative_time;
use parse_relative_time::parse_relative_time_at_date;
use parse_timestamp::parse_timestamp;

#[derive(Debug, PartialEq)]
Expand Down Expand Up @@ -228,12 +228,8 @@ pub fn parse_datetime_at_date<S: AsRef<str> + Clone>(
}

// Parse relative time.
if let Ok(relative_time) = parse_relative_time(s.as_ref()) {
let current_time = DateTime::<FixedOffset>::from(date);

if let Some(date_time) = current_time.checked_add_signed(relative_time) {
return Ok(date_time);
}
if let Ok(datetime) = parse_relative_time_at_date(date, s.as_ref()) {
return Ok(DateTime::<FixedOffset>::from(datetime));
}

// parse time only dates
Expand Down
Loading