Skip to content

Prepare the new relase + clippy #119

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
merged 2 commits into from
Feb 17, 2025
Merged

Prepare the new relase + clippy #119

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
93e1c9b
prepare 0.8.0
sylvestre Feb 16, 2025
46cc414
fix clippy pedantic
sylvestre Feb 16, 2025
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
2 changes: 1 addition & 1 deletion Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[package]
name = "parse_datetime"
description = "parsing human-readable time strings and converting them to a DateTime"
version = "0.7.0"
version = "0.8.0"
edition = "2021"
license = "MIT"
repository = "https://github.com/uutils/parse_datetime"
Expand Down
30 changes: 15 additions & 15 deletions src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -240,14 +240,13 @@ pub fn parse_datetime_at_date<S: AsRef<str> + Clone>(
// reference date could be parsed, then try to parse the entire
// string as a time delta. If no time delta could be parsed,
// return an error.
let (ref_date, n) = match parse_reference_date(date, s.as_ref()) {
Some((ref_date, n)) => (ref_date, n),
None => {
let tz = TimeZone::from_offset(date.offset());
match date.naive_local().and_local_timezone(tz) {
MappedLocalTime::Single(ref_date) => (ref_date, 0),
_ => return Err(ParseDateTimeError::InvalidInput),
}
let (ref_date, n) = if let Some((ref_date, n)) = parse_reference_date(date, s.as_ref()) {
(ref_date, n)
} else {
let tz = TimeZone::from_offset(date.offset());
match date.naive_local().and_local_timezone(tz) {
MappedLocalTime::Single(ref_date) => (ref_date, 0),
_ => return Err(ParseDateTimeError::InvalidInput),
}
};
parse_relative_time_at_date(ref_date, &s.as_ref()[n..])
Expand Down Expand Up @@ -619,12 +618,12 @@ mod tests {
for offset in offsets {
// positive offset
let time = Utc.timestamp_opt(offset, 0).unwrap();
let dt = parse_datetime(format!("@{}", offset));
let dt = parse_datetime(format!("@{offset}"));
assert_eq!(dt.unwrap(), time);

// negative offset
let time = Utc.timestamp_opt(-offset, 0).unwrap();
let dt = parse_datetime(format!("@-{}", offset));
let dt = parse_datetime(format!("@-{offset}"));
assert_eq!(dt.unwrap(), time);
}
}
Expand All @@ -642,7 +641,7 @@ mod tests {
let parsed_time = parse_datetime_at_date(test_date, "9:04:30 PM +0530")
.unwrap()
.timestamp();
assert_eq!(parsed_time, 1709480070)
assert_eq!(parsed_time, 1709480070);
}
}
/// Used to test example code presented in the README.
Expand Down Expand Up @@ -862,9 +861,10 @@ mod tests {
let now = Local::now();
let midnight = NaiveTime::from_hms_opt(0, 0, 0).unwrap();
let today = now.weekday();
let midnight_today = match now.with_time(midnight) {
MappedLocalTime::Single(t) => t,
_ => panic!(),
let midnight_today = if let MappedLocalTime::Single(t) = now.with_time(midnight) {
t
} else {
panic!()
};

for (s, day) in [
Expand All @@ -877,7 +877,7 @@ mod tests {
("saturday", Weekday::Sat),
] {
let actual = crate::parse_datetime(s).unwrap();
let delta = Days::new(day.days_since(today) as u64);
let delta = Days::new(u64::from(day.days_since(today)));
let expected = midnight_today.checked_add_days(delta).unwrap();
assert_eq!(actual, expected);
}
Expand Down
8 changes: 4 additions & 4 deletions src/parse_time_only_str.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ mod tests {
let parsed_time = parse_time_only(get_test_date(), "21:04")
.unwrap()
.timestamp();
assert_eq!(parsed_time, 1709499840)
assert_eq!(parsed_time, 1709499840);
}

#[test]
Expand Down Expand Up @@ -187,7 +187,7 @@ mod tests {
let parsed_time = parse_time_only(get_test_date(), "21:04:30")
.unwrap()
.timestamp();
assert_eq!(parsed_time, 1709499870)
assert_eq!(parsed_time, 1709499870);
}

#[test]
Expand All @@ -196,7 +196,7 @@ mod tests {
let parsed_time = parse_time_only(get_test_date(), "21:04:30 +0530")
.unwrap()
.timestamp();
assert_eq!(parsed_time, 1709480070)
assert_eq!(parsed_time, 1709480070);
}

#[test]
Expand All @@ -205,6 +205,6 @@ mod tests {
let parsed_time = parse_time_only(get_test_date(), "9:04:00 PM")
.unwrap()
.timestamp();
assert_eq!(parsed_time, 1709499840)
assert_eq!(parsed_time, 1709499840);
}
}
6 changes: 3 additions & 3 deletions src/parse_weekday.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,9 +64,9 @@ mod tests {

for (name, weekday) in days {
assert_eq!(parse_weekday(name), Some(weekday));
assert_eq!(parse_weekday(&format!(" {}", name)), Some(weekday));
assert_eq!(parse_weekday(&format!(" {} ", name)), Some(weekday));
assert_eq!(parse_weekday(&format!("{} ", name)), Some(weekday));
assert_eq!(parse_weekday(&format!(" {name}")), Some(weekday));
assert_eq!(parse_weekday(&format!(" {name} ")), Some(weekday));
assert_eq!(parse_weekday(&format!("{name} ")), Some(weekday));

let (left, right) = name.split_at(1);
let (test_str1, test_str2) = (
Expand Down