Merge branch 'liw/chore' into 'main'

fix: unnecessary borrows, other things found by clippy

See merge request obnam/obnam!244

5 files changed, 11 insertions, 11 deletions

diff --git a/src/bin/obnam-server.rs b/src/bin/obnam-server.rs
index 102e8b6..9b5a557 100644
--- a/src/bin/obnam-server.rs
+++ b/src/bin/obnam-server.rs
@@ -146,7 +146,7 @@ pub async fn search_chunks(
 
     let mut query = query.iter();
     let found = if let Some((key, value)) = query.next() {
-        if query.next() != None {
+        if query.next().is_some() {
             error!("search has more than one key to search for");
             return Ok(ChunkResult::BadRequest);
         }
diff --git a/src/chunkstore.rs b/src/chunkstore.rs
index 2b93720..750b68b 100644
--- a/src/chunkstore.rs
+++ b/src/chunkstore.rs
@@ -112,7 +112,7 @@ impl LocalStore {
         let (_, filename) = &self.filename(id);
 
         let raw =
-            std::fs::read(&filename).map_err(|err| StoreError::ReadChunk(filename.clone(), err))?;
+            std::fs::read(filename).map_err(|err| StoreError::ReadChunk(filename.clone(), err))?;
 
         Ok((raw, meta))
     }
diff --git a/src/client.rs b/src/client.rs
index 7ae6581..a924052 100644
--- a/src/client.rs
+++ b/src/client.rs
@@ -195,7 +195,7 @@ impl BackupClient {
         let gen = self.fetch_generation_chunk(gen_id).await?;
 
         // Fetch the SQLite file, storing it in the named file.
-        let mut dbfile = File::create(&dbname)
+        let mut dbfile = File::create(dbname)
             .map_err(|err| ClientError::FileCreate(dbname.to_path_buf(), err))?;
         for id in gen.chunk_ids() {
             let chunk = self.fetch_chunk(id).await?;
diff --git a/src/index.rs b/src/index.rs
index 52da2f2..42f1a95 100644
--- a/src/index.rs
+++ b/src/index.rs
@@ -139,7 +139,7 @@ mod sql {
             params![],
         )?;
         conn.execute("CREATE INDEX label_idx ON chunks (label)", params![])?;
-        conn.pragma_update(None, "journal_mode", &"WAL")?;
+        conn.pragma_update(None, "journal_mode", "WAL")?;
         Ok(conn)
     }
 
@@ -147,7 +147,7 @@ mod sql {
     pub fn open_db(filename: &Path) -> Result<Connection, IndexError> {
         let flags = OpenFlags::SQLITE_OPEN_READ_WRITE;
         let conn = Connection::open_with_flags(filename, flags)?;
-        conn.pragma_update(None, "journal_mode", &"WAL")?;
+        conn.pragma_update(None, "journal_mode", "WAL")?;
         Ok(conn)
     }
 
diff --git a/src/store.rs b/src/store.rs
index 4e85ba1..185370e 100644
--- a/src/store.rs
+++ b/src/store.rs
@@ -48,18 +48,18 @@ impl Store {
             std::fs::create_dir_all(dir)?;
         }
 
-        std::fs::write(&metaname, chunk.meta().to_json())?;
-        std::fs::write(&dataname, chunk.data())?;
+        std::fs::write(metaname, chunk.meta().to_json())?;
+        std::fs::write(dataname, chunk.data())?;
         Ok(())
     }
 
     /// Load a chunk from a store.
     pub fn load(&self, id: &ChunkId) -> Result<DataChunk, StoreError> {
         let (_, metaname, dataname) = &self.filenames(id);
-        let meta = std::fs::read(&metaname)?;
+        let meta = std::fs::read(metaname)?;
         let meta = serde_json::from_slice(&meta)?;
 
-        let data = std::fs::read(&dataname)?;
+        let data = std::fs::read(dataname)?;
         let data = DataChunk::new(data, meta);
         Ok(data)
     }
@@ -67,8 +67,8 @@ impl Store {
     /// Delete a chunk from a store.
     pub fn delete(&self, id: &ChunkId) -> Result<(), StoreError> {
         let (_, metaname, dataname) = &self.filenames(id);
-        std::fs::remove_file(&metaname)?;
-        std::fs::remove_file(&dataname)?;
+        std::fs::remove_file(metaname)?;
+        std::fs::remove_file(dataname)?;
         Ok(())
     }
 }