Skip to content

Commit 9b22a18

Browse files
authored
Merge pull request #130 from cakebaker/fix_some_clippy_pedantic_issues
clippy: fix some warnings from clippy::pedantic
2 parents 7119769 + 28b788a commit 9b22a18

File tree

2 files changed

+7
-11
lines changed

2 files changed

+7
-11
lines changed

src/lib.rs

+2-4
Original file line numberDiff line numberDiff line change
@@ -271,9 +271,8 @@ where
271271
if let Ok(parsed) = DateTime::parse_from_str(&tmp_s[0..n], fmt) {
272272
if tmp_s == s.as_ref() {
273273
return Some((parsed, n));
274-
} else {
275-
return Some((parsed, n - 1));
276274
}
275+
return Some((parsed, n - 1));
277276
}
278277
}
279278
}
@@ -351,9 +350,8 @@ where
351350
if let Ok(parsed) = DateTime::parse_from_str(&ts, &f) {
352351
if tmp_s == s.as_ref() {
353352
return Some((parsed, n));
354-
} else {
355-
return Some((parsed, n - 1));
356353
}
354+
return Some((parsed, n - 1));
357355
}
358356
}
359357
}

src/parse_time_only_str.rs

+5-7
Original file line numberDiff line numberDiff line change
@@ -57,14 +57,12 @@ fn parse_time_with_offset_multi(
5757
time_only_formats::HH_MM_SS,
5858
time_only_formats::TWELVE_HOUR,
5959
] {
60-
let parsed = match NaiveTime::parse_from_str(s, fmt) {
61-
Ok(t) => t,
62-
Err(_) => continue,
60+
let Ok(parsed) = NaiveTime::parse_from_str(s, fmt) else {
61+
continue;
6362
};
6463
let parsed_dt = date.date_naive().and_time(parsed);
65-
match offset.from_local_datetime(&parsed_dt).single() {
66-
Some(dt) => return Some(dt),
67-
None => continue,
64+
if let Some(dt) = offset.from_local_datetime(&parsed_dt).single() {
65+
return Some(dt);
6866
}
6967
}
7068
None
@@ -84,7 +82,7 @@ pub(crate) fn parse_time_only(date: DateTime<Local>, s: &str) -> Option<DateTime
8482
offset_in_sec += minutes.as_str().parse::<i32>().unwrap() * 60;
8583
}
8684
_ => (),
87-
};
85+
}
8886
offset_in_sec *= if &captures["sign"] == "-" { -1 } else { 1 };
8987
FixedOffset::east_opt(offset_in_sec)
9088
}

0 commit comments

Comments
 (0)