GothenburgBitFactory/taskwarrior
1
0
Fork 0
mirror of https://github.com/GothenburgBitFactory/taskwarrior.git synced 2025-07-07 20:06:36 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Clippy things

Browse source
This commit is contained in:
dbr 2021-05-28 20:41:03 +10:00
parent 0f6323e2de
commit 7c665c9a77
2 changed files with 7 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

7
sync-server/src/storage/sqlite.rs
View file

@ -8,6 +8,8 @@ use std::path::Path;
enum SqliteError { enum SqliteError {
#[error("SQLite transaction already committted")] #[error("SQLite transaction already committted")]
TransactionAlreadyCommitted, TransactionAlreadyCommitted,
#[error("Failed to create SQLite transaction")]
CreateTransactionFailed,
} }
/// Newtype to allow implementing `FromSql` for foreign `uuid::Uuid` /// Newtype to allow implementing `FromSql` for foreign `uuid::Uuid`
@ -96,7 +98,10 @@ struct Txn<'t> {
impl<'t> Txn<'t> { impl<'t> Txn<'t> {
fn get_txn(&mut self) -> Result<rusqlite::Transaction, SqliteError> { fn get_txn(&mut self) -> Result<rusqlite::Transaction, SqliteError> {
Ok(self.con.transaction().unwrap()) Ok(self
.con
.transaction()
.map_err(|_e| SqliteError::CreateTransactionFailed)?)
} }
} }

2
taskchampion/src/server/local.rs
View file

@ -50,7 +50,7 @@ pub struct LocalServer {
} }
impl LocalServer { impl LocalServer {
fn txn<'a>(&'a mut self) -> anyhow::Result<rusqlite::Transaction> { fn txn(&mut self) -> anyhow::Result<rusqlite::Transaction> {
let txn = self.con.transaction()?; let txn = self.con.transaction()?;
Ok(txn) Ok(txn)
} }