From b091f8e95347ae34a67b379ccf37ea515e1d3edb Mon Sep 17 00:00:00 2001 From: race604 Date: Wed, 31 Aug 2022 22:10:16 +0800 Subject: [PATCH] fix lint error reported by clippy --- src/app.rs | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/src/app.rs b/src/app.rs index 8b72aa9..220f12d 100644 --- a/src/app.rs +++ b/src/app.rs @@ -273,32 +273,32 @@ fn parse_datetime(s: &str) -> Result, String> { let today = Local::today(); let time = NaiveTime::parse_from_str(s, "%H:%M"); - if time.is_ok() { - let time = NaiveDateTime::new(today.naive_local(), time.unwrap()); + if let Ok(time) = time { + let time = NaiveDateTime::new(today.naive_local(), time); return Ok(Local.from_local_datetime(&time).unwrap()); } let time = NaiveTime::parse_from_str(s, "%H:%M:%S"); - if time.is_ok() { - let time = NaiveDateTime::new(today.naive_local(), time.unwrap()); + if let Ok(time) = time { + let time = NaiveDateTime::new(today.naive_local(), time); return Ok(Local.from_local_datetime(&time).unwrap()); } let date = NaiveDate::parse_from_str(s, "%Y-%m-%d"); - if date.is_ok() { - let time = NaiveDateTime::new(date.unwrap(), NaiveTime::from_hms(0, 0, 0)); + if let Ok(date) = date { + let time = NaiveDateTime::new(date, NaiveTime::from_hms(0, 0, 0)); return Ok(Local.from_local_datetime(&time).unwrap()); } let date_time = NaiveDateTime::parse_from_str(s, "%Y-%m-%d %H:%M:%S"); - if date_time.is_ok() { - return Ok(Local.from_local_datetime(&date_time.unwrap()).unwrap()); + if let Ok(date_time) = date_time { + return Ok(Local.from_local_datetime(&date_time).unwrap()); } let rfc_time = DateTime::parse_from_rfc3339(s); - if rfc_time.is_ok() { - return Ok(rfc_time.unwrap().with_timezone(&Local)); + if let Ok(rfc_time) = rfc_time { + return Ok(rfc_time.with_timezone(&Local)); } - return Err("Invalid time format".to_string()); + Err("Invalid time format".to_string()) }