Skip to content

Commit d4384ce

Browse files
authored
Merge pull request #119 from sylvestre/new-release
Prepare the new relase + clippy
2 parents e7a7a0b + 46cc414 commit d4384ce

File tree

5 files changed

+24
-24
lines changed

5 files changed

+24
-24
lines changed

Cargo.lock

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[package]
22
name = "parse_datetime"
33
description = "parsing human-readable time strings and converting them to a DateTime"
4-
version = "0.7.0"
4+
version = "0.8.0"
55
edition = "2021"
66
license = "MIT"
77
repository = "https://github.com/uutils/parse_datetime"

src/lib.rs

+15-15
Original file line numberDiff line numberDiff line change
@@ -240,14 +240,13 @@ pub fn parse_datetime_at_date<S: AsRef<str> + Clone>(
240240
// reference date could be parsed, then try to parse the entire
241241
// string as a time delta. If no time delta could be parsed,
242242
// return an error.
243-
let (ref_date, n) = match parse_reference_date(date, s.as_ref()) {
244-
Some((ref_date, n)) => (ref_date, n),
245-
None => {
246-
let tz = TimeZone::from_offset(date.offset());
247-
match date.naive_local().and_local_timezone(tz) {
248-
MappedLocalTime::Single(ref_date) => (ref_date, 0),
249-
_ => return Err(ParseDateTimeError::InvalidInput),
250-
}
243+
let (ref_date, n) = if let Some((ref_date, n)) = parse_reference_date(date, s.as_ref()) {
244+
(ref_date, n)
245+
} else {
246+
let tz = TimeZone::from_offset(date.offset());
247+
match date.naive_local().and_local_timezone(tz) {
248+
MappedLocalTime::Single(ref_date) => (ref_date, 0),
249+
_ => return Err(ParseDateTimeError::InvalidInput),
251250
}
252251
};
253252
parse_relative_time_at_date(ref_date, &s.as_ref()[n..])
@@ -619,12 +618,12 @@ mod tests {
619618
for offset in offsets {
620619
// positive offset
621620
let time = Utc.timestamp_opt(offset, 0).unwrap();
622-
let dt = parse_datetime(format!("@{}", offset));
621+
let dt = parse_datetime(format!("@{offset}"));
623622
assert_eq!(dt.unwrap(), time);
624623

625624
// negative offset
626625
let time = Utc.timestamp_opt(-offset, 0).unwrap();
627-
let dt = parse_datetime(format!("@-{}", offset));
626+
let dt = parse_datetime(format!("@-{offset}"));
628627
assert_eq!(dt.unwrap(), time);
629628
}
630629
}
@@ -642,7 +641,7 @@ mod tests {
642641
let parsed_time = parse_datetime_at_date(test_date, "9:04:30 PM +0530")
643642
.unwrap()
644643
.timestamp();
645-
assert_eq!(parsed_time, 1709480070)
644+
assert_eq!(parsed_time, 1709480070);
646645
}
647646
}
648647
/// Used to test example code presented in the README.
@@ -862,9 +861,10 @@ mod tests {
862861
let now = Local::now();
863862
let midnight = NaiveTime::from_hms_opt(0, 0, 0).unwrap();
864863
let today = now.weekday();
865-
let midnight_today = match now.with_time(midnight) {
866-
MappedLocalTime::Single(t) => t,
867-
_ => panic!(),
864+
let midnight_today = if let MappedLocalTime::Single(t) = now.with_time(midnight) {
865+
t
866+
} else {
867+
panic!()
868868
};
869869

870870
for (s, day) in [
@@ -877,7 +877,7 @@ mod tests {
877877
("saturday", Weekday::Sat),
878878
] {
879879
let actual = crate::parse_datetime(s).unwrap();
880-
let delta = Days::new(day.days_since(today) as u64);
880+
let delta = Days::new(u64::from(day.days_since(today)));
881881
let expected = midnight_today.checked_add_days(delta).unwrap();
882882
assert_eq!(actual, expected);
883883
}

src/parse_time_only_str.rs

+4-4
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ mod tests {
140140
let parsed_time = parse_time_only(get_test_date(), "21:04")
141141
.unwrap()
142142
.timestamp();
143-
assert_eq!(parsed_time, 1709499840)
143+
assert_eq!(parsed_time, 1709499840);
144144
}
145145

146146
#[test]
@@ -187,7 +187,7 @@ mod tests {
187187
let parsed_time = parse_time_only(get_test_date(), "21:04:30")
188188
.unwrap()
189189
.timestamp();
190-
assert_eq!(parsed_time, 1709499870)
190+
assert_eq!(parsed_time, 1709499870);
191191
}
192192

193193
#[test]
@@ -196,7 +196,7 @@ mod tests {
196196
let parsed_time = parse_time_only(get_test_date(), "21:04:30 +0530")
197197
.unwrap()
198198
.timestamp();
199-
assert_eq!(parsed_time, 1709480070)
199+
assert_eq!(parsed_time, 1709480070);
200200
}
201201

202202
#[test]
@@ -205,6 +205,6 @@ mod tests {
205205
let parsed_time = parse_time_only(get_test_date(), "9:04:00 PM")
206206
.unwrap()
207207
.timestamp();
208-
assert_eq!(parsed_time, 1709499840)
208+
assert_eq!(parsed_time, 1709499840);
209209
}
210210
}

src/parse_weekday.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -64,9 +64,9 @@ mod tests {
6464

6565
for (name, weekday) in days {
6666
assert_eq!(parse_weekday(name), Some(weekday));
67-
assert_eq!(parse_weekday(&format!(" {}", name)), Some(weekday));
68-
assert_eq!(parse_weekday(&format!(" {} ", name)), Some(weekday));
69-
assert_eq!(parse_weekday(&format!("{} ", name)), Some(weekday));
67+
assert_eq!(parse_weekday(&format!(" {name}")), Some(weekday));
68+
assert_eq!(parse_weekday(&format!(" {name} ")), Some(weekday));
69+
assert_eq!(parse_weekday(&format!("{name} ")), Some(weekday));
7070

7171
let (left, right) = name.split_at(1);
7272
let (test_str1, test_str2) = (

0 commit comments

Comments
 (0)