PlexSheep/crock
Archived
1
0
Fork 0
generated from PlexSheep/rs-base
Code Issues 7 Pull requests Projects Releases 9 Packages 1 Wiki Activity

Merge pull request #18 from race604/fix-lint-by-clippy

Browse source 
fix lint error reported by clippy
This commit is contained in:
Jimmy 2022-08-31 22:10:44 +08:00 • committed by GitHub
commit 3f357f3fd2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/app.rs
View file

@ -273,32 +273,32 @@ fn parse_datetime(s: &str) -> Result<DateTime<Local>, String> {
let today = Local::today(); let today = Local::today();
let time = NaiveTime::parse_from_str(s, "%H:%M"); let time = NaiveTime::parse_from_str(s, "%H:%M");
if time.is_ok() { if let Ok(time) = time {
let time = NaiveDateTime::new(today.naive_local(), time.unwrap()); let time = NaiveDateTime::new(today.naive_local(), time);
return Ok(Local.from_local_datetime(&time).unwrap()); return Ok(Local.from_local_datetime(&time).unwrap());
} }
let time = NaiveTime::parse_from_str(s, "%H:%M:%S"); let time = NaiveTime::parse_from_str(s, "%H:%M:%S");
if time.is_ok() { if let Ok(time) = time {
let time = NaiveDateTime::new(today.naive_local(), time.unwrap()); let time = NaiveDateTime::new(today.naive_local(), time);
return Ok(Local.from_local_datetime(&time).unwrap()); return Ok(Local.from_local_datetime(&time).unwrap());
} }
let date = NaiveDate::parse_from_str(s, "%Y-%m-%d"); let date = NaiveDate::parse_from_str(s, "%Y-%m-%d");
if date.is_ok() { if let Ok(date) = date {
let time = NaiveDateTime::new(date.unwrap(), NaiveTime::from_hms(0, 0, 0)); let time = NaiveDateTime::new(date, NaiveTime::from_hms(0, 0, 0));
return Ok(Local.from_local_datetime(&time).unwrap()); return Ok(Local.from_local_datetime(&time).unwrap());
} }
let date_time = NaiveDateTime::parse_from_str(s, "%Y-%m-%d %H:%M:%S"); let date_time = NaiveDateTime::parse_from_str(s, "%Y-%m-%d %H:%M:%S");
if date_time.is_ok() { if let Ok(date_time) = date_time {
return Ok(Local.from_local_datetime(&date_time.unwrap()).unwrap()); return Ok(Local.from_local_datetime(&date_time).unwrap());
} }
let rfc_time = DateTime::parse_from_rfc3339(s); let rfc_time = DateTime::parse_from_rfc3339(s);
if rfc_time.is_ok() { if let Ok(rfc_time) = rfc_time {
return Ok(rfc_time.unwrap().with_timezone(&Local)); return Ok(rfc_time.with_timezone(&Local));
} }
return Err("Invalid time format".to_string()); Err("Invalid time format".to_string())
} }