From 11d0172bf805d3918d04933ee3c7bb934634eef6 Mon Sep 17 00:00:00 2001 From: dbr Date: Thu, 22 Apr 2021 14:15:50 +1000 Subject: [PATCH] fmt --- taskchampion/src/storage/mod.rs | 2 +- taskchampion/src/storage/sqlite.rs | 15 +++++++-------- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/taskchampion/src/storage/mod.rs b/taskchampion/src/storage/mod.rs index b4993b039..a4c430b94 100644 --- a/taskchampion/src/storage/mod.rs +++ b/taskchampion/src/storage/mod.rs @@ -12,8 +12,8 @@ use uuid::Uuid; mod config; mod inmemory; mod kv; -mod sqlite; mod operation; +mod sqlite; pub use self::kv::KvStorage; pub use config::StorageConfig; diff --git a/taskchampion/src/storage/sqlite.rs b/taskchampion/src/storage/sqlite.rs index dfafba7b9..2dc2e7dbd 100644 --- a/taskchampion/src/storage/sqlite.rs +++ b/taskchampion/src/storage/sqlite.rs @@ -1,7 +1,7 @@ use crate::storage::{Operation, Storage, StorageTxn, TaskMap, VersionId, DEFAULT_BASE_VERSION}; use crate::utils::Key; use anyhow::Context; -use rusqlite::{Connection, OptionalExtension, params}; +use rusqlite::{params, Connection, OptionalExtension}; use serde::serde_if_integer128; use std::path::Path; use uuid::Uuid; @@ -111,13 +111,12 @@ impl<'t> StorageTxn for Txn<'t> { fn all_tasks(&mut self) -> anyhow::Result> { let t = self.get_txn()?; let mut q = t.prepare("SELECT uuid, data FROM tasks")?; - let rows = q - .query_map([], |r| { - let uuid: Uuid = r.get("uuid")?; - let data_str: String = r.get("data")?; - let data = serde_json::from_str(&data_str).unwrap(); // FIXME: Remove unwrap - Ok((uuid, data)) - })?; + let rows = q.query_map([], |r| { + let uuid: Uuid = r.get("uuid")?; + let data_str: String = r.get("data")?; + let data: TaskMap = serde_json::from_str(&data_str).unwrap(); // FIXME: Remove unwrap + Ok((uuid, data)) + })?; let mut ret = vec![]; for r in rows { ret.push(r?);