diff --git a/src/crypt.rs b/src/crypt.rs index 1d40ae7..bf42c58 100644 --- a/src/crypt.rs +++ b/src/crypt.rs @@ -165,7 +165,7 @@ pub fn encrypt_value(value: &str, master_key: [u8; 32]) -> EncryptedValue { hmac.input(&output[..]); EncryptedValue { ciphertext: output, - iv: iv, + iv, mac: hmac.result(), } } diff --git a/src/db.rs b/src/db.rs index 73bd05c..73d6dc6 100644 --- a/src/db.rs +++ b/src/db.rs @@ -7,7 +7,7 @@ use std::error::Error; use std::fmt; use std::path::PathBuf; -static DB_INIT_QUERY: &'static str = include_str!("init.sql"); +static DB_INIT_QUERY: &str = include_str!("init.sql"); pub struct DbHandle { conn: Connection, @@ -50,13 +50,13 @@ impl DbHandle { pub fn new(db_path: &Option) -> DbHandle { let path: PathBuf = db_path .as_ref() - .map(|path: &String| PathBuf::from(path)) + .map(PathBuf::from) .unwrap_or_else(|| dirs::home_dir().unwrap().join(".foil").to_path_buf()); let mut conn: Connection = Connection::open(path).unwrap(); let tx = conn.transaction().unwrap(); tx.execute_batch(DB_INIT_QUERY).unwrap(); tx.commit().unwrap(); - DbHandle { conn: conn } + DbHandle { conn } } pub fn get_namespace_id( @@ -93,7 +93,7 @@ impl DbHandle { ) .unwrap(); let rowid: i64 = tx.last_insert_rowid(); - let _ = tx.commit().unwrap(); + tx.commit().unwrap(); Ok(rowid) } @@ -125,7 +125,7 @@ impl DbHandle { ) .unwrap(); - let _ = tx.commit().unwrap(); + tx.commit().unwrap(); } pub fn read_notes(&mut self, master_key: [u8; 32]) -> rusqlite::Result> { @@ -215,7 +215,7 @@ impl DbHandle { .map(|option| option.map(|prop| prop.from_base64().unwrap())) } - pub fn set_db_property_bytes(&self, name: &str, value: &Vec) { + pub fn set_db_property_bytes(&self, name: &str, value: &[u8]) { let b64value: String = value.to_base64(base64::STANDARD); self.set_db_property(name, &b64value); } diff --git a/src/generate.rs b/src/generate.rs index 2c27c11..4b2110d 100644 --- a/src/generate.rs +++ b/src/generate.rs @@ -5,7 +5,7 @@ use std::iter::FromIterator; pub fn generate(spec: &str) { let (len, rest) = { - let mut separated = spec.splitn(2, ","); + let mut separated = spec.splitn(2, ','); let len = separated.next().unwrap(); let rest = separated.next().unwrap(); (len, rest) diff --git a/src/main.rs b/src/main.rs index 57f0306..ce2e924 100644 --- a/src/main.rs +++ b/src/main.rs @@ -16,7 +16,7 @@ pub mod crypt; pub mod db; pub mod generate; -static USAGE: &'static str = " +static USAGE: &str = " foil Usage: