From 340965b1f5f810414742076501a2fff8a39db674 Mon Sep 17 00:00:00 2001
From: Vika <vika@fireburn.ru>
Date: Mon, 27 Sep 2021 17:41:19 +0300
Subject: Code cleanup and Cargo.lock updates

---
 src/database/file/mod.rs | 5 +++--
 src/database/mod.rs      | 5 +++--
 2 files changed, 6 insertions(+), 4 deletions(-)

(limited to 'src')

diff --git a/src/database/file/mod.rs b/src/database/file/mod.rs
index 78b67fb..acbb44b 100644
--- a/src/database/file/mod.rs
+++ b/src/database/file/mod.rs
@@ -1,5 +1,5 @@
 use async_std::fs::{File, OpenOptions};
-use async_std::io::{ErrorKind as IOErrorKind, BufReader};
+use async_std::io::{ErrorKind as IOErrorKind};
 use async_std::io::prelude::*;
 use async_std::task::spawn_blocking;
 use async_trait::async_trait;
@@ -177,6 +177,7 @@ pub struct FileStorage {
 }
 
 impl FileStorage {
+    /// Create a new storage wrapping a folder specified by root_dir.
     pub async fn new(root_dir: PathBuf) -> Result<Self> {
         // TODO check if the dir is writable
         Ok(Self { root_dir })
@@ -237,7 +238,7 @@ impl Storage for FileStorage {
             .create_new(true)
             .open(&path)
             .await?;
-        
+
         let mut lock = get_lockable_file(f).await;
         let mut guard = lock.write()?;
 
diff --git a/src/database/mod.rs b/src/database/mod.rs
index 0b97c24..7c67e42 100644
--- a/src/database/mod.rs
+++ b/src/database/mod.rs
@@ -7,8 +7,7 @@ use serde::{Deserialize, Serialize};
 mod redis;
 #[cfg(redis)]
 pub use crate::database::redis::RedisStorage;
-#[cfg(redis)]
-#[cfg(test)]
+#[cfg(all(redis, test))]
 pub use redis::tests::{get_redis_instance, RedisInstance};
 
 mod file;
@@ -36,6 +35,8 @@ pub struct StorageError {
     source: Option<Box<dyn std::error::Error>>,
     kind: ErrorKind,
 }
+// XXX figure out what makes this un-sendable by default
+// and if it's sound to mark StorageError as Send & Sync
 unsafe impl Send for StorageError {}
 unsafe impl Sync for StorageError {}
 impl From<StorageError> for tide::Response {
-- 
cgit 1.4.1