From 7f587418daf8e7ddc5e32f06f85e9724c2ecf355 Mon Sep 17 00:00:00 2001
From: Lucas Burns <44355502+lmburns@users.noreply.github.com>
Date: Sun, 13 Mar 2022 14:53:49 -0500
Subject: Fix `history list --cwd` errors (#278)

---
 atuin-server/Cargo.toml    |  9 ---------
 atuin-server/src/router.rs | 17 ++++++++---------
 2 files changed, 8 insertions(+), 18 deletions(-)

(limited to 'atuin-server')

diff --git a/atuin-server/Cargo.toml b/atuin-server/Cargo.toml
index 4cef7089..4ad048c2 100644
--- a/atuin-server/Cargo.toml
+++ b/atuin-server/Cargo.toml
@@ -12,28 +12,19 @@ repository = "https://github.com/ellie/atuin"
 atuin-common = { path = "../atuin-common", version = "0.8.0" }
 
 log = "0.4"
-fern = {version = "0.6.0", features = ["colored"] }
 chrono = { version = "0.4", features = ["serde"] }
 eyre = "0.6"
-directories = "3"
 uuid = { version = "0.8", features = ["v4"] }
-indicatif = "0.16.2"
 whoami = "1.1.2"
-chrono-english = "0.1.4"
 config = "0.11"
 serde_derive = "1.0.125"
 serde = "1.0.126"
 serde_json = "1.0.75"
-rmp-serde = "0.15.5"
-unicode-width = "0.1"
 sodiumoxide = "0.2.6"
 base64 = "0.13.0"
-fork = "0.1.18"
-parse_duration = "2.1.1"
 rand = "0.8.4"
 rust-crypto = "^0.2"
 tokio = { version = "1", features = ["full"] }
 warp = "0.3"
 sqlx = { version = "0.5", features = [ "runtime-tokio-rustls", "uuid", "chrono", "postgres" ] }
 async-trait = "0.1.49"
-urlencoding = "1.3.3"
diff --git a/atuin-server/src/router.rs b/atuin-server/src/router.rs
index 04905a0f..f7e142a0 100644
--- a/atuin-server/src/router.rs
+++ b/atuin-server/src/router.rs
@@ -5,10 +5,11 @@ use warp::{hyper::StatusCode, Filter};
 
 use atuin_common::api::SyncHistoryRequest;
 
-use super::handlers;
-use super::{database::Database, database::Postgres};
-use crate::models::User;
-use crate::settings::Settings;
+use super::{
+    database::{Database, Postgres},
+    handlers,
+};
+use crate::{models::User, settings::Settings};
 
 fn with_settings(
     settings: Settings,
@@ -32,17 +33,15 @@ fn with_user(
         async move {
             let header: Vec<&str> = header.split(' ').collect();
 
-            let token;
-
-            if header.len() == 2 {
+            let token = if header.len() == 2 {
                 if header[0] != "Token" {
                     return Err(warp::reject());
                 }
 
-                token = header[1];
+                header[1]
             } else {
                 return Err(warp::reject());
-            }
+            };
 
             let user = postgres
                 .get_session_user(token)
-- 
cgit v1.3.1