myriation/atuin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Run formatting (#1202)

Browse source
This commit is contained in:
Ellie Huxtable 2023-08-30 22:37:15 +01:00 committed by GitHub
parent 340b9d8a2b
commit dead8f3645
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
atuin-common/src/utils.rs
View file

@ -112,8 +112,12 @@ pub fn get_current_dir() -> String {
} }
pub fn get_days_from_month(year: i32, month: u32) -> i64 { pub fn get_days_from_month(year: i32, month: u32) -> i64 {
let Some(start) = NaiveDate::from_ymd_opt(year, month, 1) else { return 30 }; let Some(start) = NaiveDate::from_ymd_opt(year, month, 1) else {
let Some(end) = start.checked_add_months(Months::new(1)) else { return 30 }; return 30;
};
let Some(end) = start.checked_add_months(Months::new(1)) else {
return 30;
};
end.signed_duration_since(start).num_days() end.signed_duration_since(start).num_days()
} }

4
atuin-server/src/handlers/user.rs
View file

@ -28,7 +28,9 @@ use atuin_common::api::*;
pub fn verify_str(hash: &str, password: &str) -> bool { pub fn verify_str(hash: &str, password: &str) -> bool {
let arg2 = Argon2::new(Algorithm::Argon2id, Version::V0x13, Params::default()); let arg2 = Argon2::new(Algorithm::Argon2id, Version::V0x13, Params::default());
let Ok(hash) = PasswordHash::new(hash) else { return false }; let Ok(hash) = PasswordHash::new(hash) else {
return false;
};
arg2.verify_password(password.as_bytes(), &hash).is_ok() arg2.verify_password(password.as_bytes(), &hash).is_ok()
} }