diff options
author | Lars Wirzenius <liw@liw.fi> | 2021-04-06 08:49:21 +0300 |
---|---|---|
committer | Lars Wirzenius <liw@liw.fi> | 2021-04-06 08:49:21 +0300 |
commit | 990a8fb9f6eecfceb3f8bea05a734736695d5c6d (patch) | |
tree | 434b8541e6a1ca3864397911b52a39bc51342cf0 | |
parent | 65092dce07b1c389acd6235d9f230575f11b1a6c (diff) | |
download | obnam2-990a8fb9f6eecfceb3f8bea05a734736695d5c6d.tar.gz |
chore: clean up unnecessary use of ? based on clippy reports
-rw-r--r-- | src/generation.rs | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/generation.rs b/src/generation.rs index 72d4468..1d0ee52 100644 --- a/src/generation.rs +++ b/src/generation.rs @@ -193,23 +193,23 @@ impl LocalGeneration { } pub fn file_count(&self) -> LocalGenerationResult<i64> { - Ok(sql::file_count(&self.conn)?) + sql::file_count(&self.conn) } pub fn files(&self) -> LocalGenerationResult<Vec<BackedUpFile>> { - Ok(sql::files(&self.conn)?) + sql::files(&self.conn) } pub fn chunkids(&self, fileno: FileId) -> LocalGenerationResult<Vec<ChunkId>> { - Ok(sql::chunkids(&self.conn, fileno)?) + sql::chunkids(&self.conn, fileno) } pub fn get_file(&self, filename: &Path) -> LocalGenerationResult<Option<FilesystemEntry>> { - Ok(sql::get_file(&self.conn, filename)?) + sql::get_file(&self.conn, filename) } pub fn get_fileno(&self, filename: &Path) -> LocalGenerationResult<Option<FileId>> { - Ok(sql::get_fileno(&self.conn, filename)?) + sql::get_fileno(&self.conn, filename) } } @@ -303,7 +303,7 @@ mod sql { pub fn chunkids(conn: &Connection, fileno: FileId) -> LocalGenerationResult<Vec<ChunkId>> { let mut stmt = conn.prepare("SELECT chunkid FROM chunks WHERE fileno = ?1")?; - let iter = stmt.query_map(params![fileno], |row| Ok(row.get(0)?))?; + let iter = stmt.query_map(params![fileno], |row| row.get(0))?; let mut ids: Vec<ChunkId> = vec![]; for x in iter { let fileno: String = x?; |