From 967e3a3c7d04953582030c963c44487dbb1a5e5a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Ml=C3=A1dek?= <t@mldk.cz>
Date: Sun, 20 Sep 2020 19:32:28 +0200
Subject: [PATCH] lint

---
 src/filesystem.rs | 7 +++----
 src/hash.rs       | 2 +-
 src/main.rs       | 3 ---
 src/routes.rs     | 2 --
 4 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/src/filesystem.rs b/src/filesystem.rs
index cc4f233..670e8a9 100644
--- a/src/filesystem.rs
+++ b/src/filesystem.rs
@@ -3,9 +3,8 @@ use crate::database::{
     insert_entry, insert_file, query_entries, retrieve_object, DbPool, Entry, EntryQuery,
     EntryValue, InnerEntry,
 };
-use crate::hash::{hash, ComputeHash, Hashable, HasherWorker};
+use crate::hash::Hashable;
 use crate::models;
-use actix::prelude::*;
 use anyhow::{anyhow, Error, Result};
 use chrono::prelude::*;
 use diesel::sqlite::Sqlite;
@@ -245,9 +244,9 @@ pub fn fetch_or_create_dir<C: Connection<Backend = Sqlite>>(
                 };
                 let _ = insert_entry(connection, directory_entry)?;
 
-                if parent.is_some() {
+                if let Some(parent_addr) = parent {
                     let has_entry = InnerEntry {
-                        target: parent.unwrap(),
+                        target: parent_addr,
                         key: String::from(DIR_HAS_KEY),
                         value: EntryValue::Address(new_directory_address.clone()),
                     };
diff --git a/src/hash.rs b/src/hash.rs
index e085dc6..ad2bfb5 100644
--- a/src/hash.rs
+++ b/src/hash.rs
@@ -1,7 +1,7 @@
 use actix::prelude::*;
 use anyhow::{anyhow, Result};
 use filebuffer::FileBuffer;
-use std::path::{Path, PathBuf};
+use std::path::PathBuf;
 use tiny_keccak::{Hasher, KangarooTwelve};
 
 #[derive(Debug, Clone, PartialEq)]
diff --git a/src/main.rs b/src/main.rs
index 4547211..845ebbf 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -7,7 +7,6 @@ use std::env;
 use std::net::SocketAddr;
 use std::path::PathBuf;
 
-use actix::prelude::*;
 use actix_web::{middleware, App, HttpServer};
 use anyhow::Result;
 use clap::{App as ClapApp, Arg};
@@ -61,7 +60,6 @@ fn main() -> Result<()> {
         .expect("failed to open database!");
 
     let db_pool = open_result.pool;
-    let hash_addr = SyncArbiter::start(4, || hash::HasherWorker);
 
     let bind: SocketAddr = matches
         .value_of("BIND")
@@ -73,7 +71,6 @@ fn main() -> Result<()> {
     let state = routes::State {
         directory: vault_path.clone(),
         db_pool: db_pool.clone(),
-        hasher: hash_addr.clone(),
     };
 
     // Start HTTP server
diff --git a/src/routes.rs b/src/routes.rs
index b534bae..bef54ac 100644
--- a/src/routes.rs
+++ b/src/routes.rs
@@ -2,7 +2,6 @@ use crate::addressing::Address;
 use crate::database::{lookup_by_filename, retrieve_by_hash, retrieve_object, DbPool, Entry};
 use crate::filesystem::{list_directory, UPath};
 use crate::hash::{decode, encode};
-use actix::prelude::*;
 use actix_files::NamedFile;
 use actix_web::error::{ErrorBadRequest, ErrorInternalServerError, ErrorNotFound};
 use actix_web::{error, get, post, web, Error, HttpResponse};
@@ -16,7 +15,6 @@ use std::path::PathBuf;
 pub struct State {
     pub directory: PathBuf,
     pub db_pool: DbPool,
-    pub hasher: Addr<crate::hash::HasherWorker>,
 }
 
 #[get("/raw/{hash}")]