Merge branch 'tidy-up' into 'main'

tidy up

Closes #169

See merge request obnam/obnam!198

1 files changed, 6 insertions, 17 deletions

diff --git a/src/index.rs b/src/index.rs
index d548396..d76e4a3 100644
--- a/src/index.rs
+++ b/src/index.rs
@@ -2,8 +2,7 @@ use crate::checksummer::Checksum;
 use crate::chunkid::ChunkId;
 use crate::chunkmeta::ChunkMeta;
 use rusqlite::Connection;
-use std::collections::HashMap;
-use std::path::{Path, PathBuf};
+use std::path::Path;
 
 /// A chunk index.
 ///
@@ -11,11 +10,7 @@ use std::path::{Path, PathBuf};
 /// string key/value pair, or whether they are generations.
 #[derive(Debug)]
 pub struct Index {
-    filename: PathBuf,
     conn: Connection,
-    map: HashMap<(String, String), Vec<ChunkId>>,
-    generations: Vec<ChunkId>,
-    metas: HashMap<ChunkId, ChunkMeta>,
 }
 
 /// All the errors that may be returned for `Index`.
@@ -42,13 +37,7 @@ impl Index {
         } else {
             sql::create_db(&filename)?
         };
-        Ok(Self {
-            filename,
-            conn,
-            map: HashMap::new(),
-            generations: vec![],
-            metas: HashMap::new(),
-        })
+        Ok(Self { conn })
     }
 
     pub fn insert_meta(&mut self, id: ChunkId, meta: ChunkMeta) -> Result<(), IndexError> {
@@ -209,7 +198,7 @@ mod sql {
 
     pub fn lookup(conn: &Connection, id: &ChunkId) -> Result<ChunkMeta, IndexError> {
         let mut stmt = conn.prepare("SELECT * FROM chunks WHERE id IS ?1")?;
-        let iter = stmt.query_map(params![id], |row| row_to_meta(row))?;
+        let iter = stmt.query_map(params![id], row_to_meta)?;
         let mut metas: Vec<ChunkMeta> = vec![];
         for meta in iter {
             let meta = meta?;
@@ -230,7 +219,7 @@ mod sql {
 
     pub fn find_by_256(conn: &Connection, sha256: &str) -> Result<Vec<ChunkId>, IndexError> {
         let mut stmt = conn.prepare("SELECT id FROM chunks WHERE sha256 IS ?1")?;
-        let iter = stmt.query_map(params![sha256], |row| row_to_id(row))?;
+        let iter = stmt.query_map(params![sha256], row_to_id)?;
         let mut ids = vec![];
         for x in iter {
             let x = x?;
@@ -241,7 +230,7 @@ mod sql {
 
     pub fn find_generations(conn: &Connection) -> Result<Vec<ChunkId>, IndexError> {
         let mut stmt = conn.prepare("SELECT id FROM chunks WHERE generation IS 1")?;
-        let iter = stmt.query_map(params![], |row| row_to_id(row))?;
+        let iter = stmt.query_map(params![], row_to_id)?;
         let mut ids = vec![];
         for x in iter {
             let x = x?;
@@ -252,7 +241,7 @@ mod sql {
 
     pub fn find_chunk_ids(conn: &Connection) -> Result<Vec<ChunkId>, IndexError> {
         let mut stmt = conn.prepare("SELECT id FROM chunks WHERE generation IS 0")?;
-        let iter = stmt.query_map(params![], |row| row_to_id(row))?;
+        let iter = stmt.query_map(params![], row_to_id)?;
         let mut ids = vec![];
         for x in iter {
             let x = x?;