chore: Fix clippy lints
This commit is contained in:
parent
b94440f6fb
commit
b5827fc596
|
@ -77,10 +77,10 @@ fn derive_master_key(email: &str, password: &str, iter_count: u32) -> (Vec<u8>,
|
|||
|
||||
// Expand master key
|
||||
let hkdf = Hkdf::<Sha256>::from_prk(&master_key).unwrap();
|
||||
hkdf.expand("enc".as_bytes(), &mut master_key).unwrap();
|
||||
hkdf.expand(b"enc", &mut master_key).unwrap();
|
||||
|
||||
let mut mac_key = vec![0u8; 32];
|
||||
hkdf.expand("mac".as_bytes(), &mut mac_key).unwrap();
|
||||
hkdf.expand(b"mac", &mut mac_key).unwrap();
|
||||
|
||||
(master_key, base64::encode(&master_key_hash), mac_key)
|
||||
}
|
||||
|
@ -168,7 +168,7 @@ impl<'de> Visitor<'de> for CipherStringVisitor {
|
|||
}
|
||||
|
||||
fn visit_str<E: serde::de::Error>(self, value: &str) -> Result<CipherString, E> {
|
||||
CipherString::from_str(value).ok_or(E::custom("invalid cipher string"))
|
||||
CipherString::from_str(value).ok_or_else(|| E::custom("invalid cipher string"))
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -13,7 +13,7 @@ use crate::vault;
|
|||
|
||||
pub fn ask(siv: &mut Cursive, default_email: Option<String>) {
|
||||
let email_edit = EditView::new()
|
||||
.content(default_email.clone().unwrap_or("".to_owned()))
|
||||
.content(default_email.clone().unwrap_or_else(|| "".to_owned()))
|
||||
.with_name("email");
|
||||
|
||||
let email_view = OnEventView::new(email_edit).on_event(Event::CtrlChar('u'), |siv| {
|
||||
|
@ -65,7 +65,7 @@ fn check_master_password(siv: &mut Cursive, email: String, master_password: &str
|
|||
|
||||
auth.cipher = CipherSuite::from(&email, master_password, auth.kdf_iterations);
|
||||
|
||||
if let Err(_) = auth.cipher.set_decrypt_key(&vault.profile.key) {
|
||||
if auth.cipher.set_decrypt_key(&vault.profile.key).is_err() {
|
||||
siv.add_layer(Dialog::info("Wrong vault password"));
|
||||
} else {
|
||||
vault::show(siv, auth, vault);
|
||||
|
@ -82,7 +82,7 @@ fn check_master_password(siv: &mut Cursive, email: String, master_password: &str
|
|||
|
||||
let vault = sync_vault_data(siv, &auth_data).unwrap();
|
||||
|
||||
if let Err(_) = auth_data.cipher.set_decrypt_key(&vault.profile.key) {
|
||||
if auth_data.cipher.set_decrypt_key(&vault.profile.key).is_err() {
|
||||
siv.add_layer(Dialog::info("Wrong vault password"));
|
||||
} else {
|
||||
vault::show(siv, auth_data, vault);
|
||||
|
|
10
src/vault.rs
10
src/vault.rs
|
@ -200,12 +200,12 @@ pub fn show(siv: &mut Cursive, auth_data: AuthData, vault_data: VaultData) {
|
|||
siv.focus_name("password_table").unwrap();
|
||||
}
|
||||
|
||||
fn fuzzy_match_on_edit(siv: &mut Cursive, items: &Vec<VaultEntry>, content: &str) {
|
||||
fn fuzzy_match_on_edit(siv: &mut Cursive, items: &[VaultEntry], content: &str) {
|
||||
let mut table = siv.find_name::<VaultTableView>("password_table").unwrap();
|
||||
|
||||
// If no search term is present, sort by name and favorite by default
|
||||
if content.len() == 0 {
|
||||
table.set_items(items.clone());
|
||||
if content.is_empty() {
|
||||
table.set_items(items.to_vec());
|
||||
|
||||
table.sort_by(VaultColumn::Name, Ordering::Less);
|
||||
table.sort_by(VaultColumn::Favorite, Ordering::Less);
|
||||
|
@ -251,7 +251,7 @@ where
|
|||
T: Serialize,
|
||||
{
|
||||
let mut path = get_app_data_path()
|
||||
.map_err(|error| ApiError::VaultDataWriteFailed(error))?;
|
||||
.map_err(ApiError::VaultDataWriteFailed)?;
|
||||
|
||||
path.push(filename);
|
||||
|
||||
|
@ -268,7 +268,7 @@ where
|
|||
T: DeserializeOwned,
|
||||
{
|
||||
let mut path = get_app_data_path()
|
||||
.map_err(|e| ApiError::VaultDataReadFailed(e))?;
|
||||
.map_err(ApiError::VaultDataReadFailed)?;
|
||||
|
||||
path.push(filename);
|
||||
|
||||
|
|
Loading…
Reference in a new issue