From 93ab4e7842ac3c3a37e8d423ae57ef3e7d151b7b Mon Sep 17 00:00:00 2001
From: Jakub Panek <me@panekj.dev>
Date: Thu, 28 Apr 2022 17:53:59 +0000
Subject: ignore JetBrains IDEs, tidy-up imports (#348)

* ignore JB IDEs

* tidy-up imports

* add rustfmt config
---
 atuin-server/src/database.rs         | 16 ++++++++--------
 atuin-server/src/handlers/history.rs | 22 +++++++++++++---------
 atuin-server/src/handlers/mod.rs     |  3 ++-
 atuin-server/src/handlers/user.rs    | 15 ++++++++-------
 atuin-server/src/settings.rs         |  7 +++----
 5 files changed, 34 insertions(+), 29 deletions(-)

(limited to 'atuin-server/src')

diff --git a/atuin-server/src/database.rs b/atuin-server/src/database.rs
index 1a3e33b3..d2246918 100644
--- a/atuin-server/src/database.rs
+++ b/atuin-server/src/database.rs
@@ -1,17 +1,17 @@
-use async_trait::async_trait;
 use std::collections::HashMap;
-use tracing::{debug, instrument};
 
+use async_trait::async_trait;
+use chrono::{Datelike, TimeZone};
+use chronoutil::RelativeDuration;
 use sqlx::{postgres::PgPoolOptions, Result};
+use tracing::{debug, instrument};
 
+use super::{
+    calendar::{TimePeriod, TimePeriodInfo},
+    models::{History, NewHistory, NewSession, NewUser, Session, User},
+};
 use crate::settings::HISTORY_PAGE_SIZE;
 
-use super::calendar::{TimePeriod, TimePeriodInfo};
-use super::models::{History, NewHistory, NewSession, NewUser, Session, User};
-
-use chrono::{Datelike, TimeZone};
-use chronoutil::RelativeDuration;
-
 use atuin_common::utils::get_days_from_month;
 
 #[async_trait]
diff --git a/atuin-server/src/handlers/history.rs b/atuin-server/src/handlers/history.rs
index aca9ecc6..2b107907 100644
--- a/atuin-server/src/handlers/history.rs
+++ b/atuin-server/src/handlers/history.rs
@@ -1,16 +1,20 @@
-use axum::extract::Query;
-use axum::{extract::Path, Extension, Json};
-use http::StatusCode;
 use std::collections::HashMap;
-use tracing::{debug, error, instrument};
-
-use crate::database::{Database, Postgres};
-use crate::models::{NewHistory, User};
-use atuin_common::api::*;
 
-use crate::calendar::{TimePeriod, TimePeriodInfo};
+use axum::{
+    extract::{Path, Query},
+    Extension, Json,
+};
+use http::StatusCode;
+use tracing::{debug, error, instrument};
 
 use super::{ErrorResponse, ErrorResponseStatus};
+use crate::{
+    calendar::{TimePeriod, TimePeriodInfo},
+    database::{Database, Postgres},
+    models::{NewHistory, User},
+};
+
+use atuin_common::api::*;
 
 #[instrument(skip_all, fields(user.id = user.id))]
 pub async fn count(
diff --git a/atuin-server/src/handlers/mod.rs b/atuin-server/src/handlers/mod.rs
index 9e6659e2..cfe08bc5 100644
--- a/atuin-server/src/handlers/mod.rs
+++ b/atuin-server/src/handlers/mod.rs
@@ -1,6 +1,7 @@
+use std::borrow::Cow;
+
 use axum::{response::IntoResponse, Json};
 use serde::{Deserialize, Serialize};
-use std::borrow::Cow;
 
 pub mod history;
 pub mod user;
diff --git a/atuin-server/src/handlers/user.rs b/atuin-server/src/handlers/user.rs
index a57269a0..42e2b5c1 100644
--- a/atuin-server/src/handlers/user.rs
+++ b/atuin-server/src/handlers/user.rs
@@ -1,18 +1,19 @@
 use std::borrow::Borrow;
 
-use atuin_common::api::*;
-use axum::extract::Path;
-use axum::{Extension, Json};
+use axum::{extract::Path, Extension, Json};
 use http::StatusCode;
 use sodiumoxide::crypto::pwhash::argon2id13;
 use tracing::{debug, error, instrument};
 use uuid::Uuid;
 
-use crate::database::{Database, Postgres};
-use crate::models::{NewSession, NewUser};
-use crate::settings::Settings;
-
 use super::{ErrorResponse, ErrorResponseStatus};
+use crate::{
+    database::{Database, Postgres},
+    models::{NewSession, NewUser},
+    settings::Settings,
+};
+
+use atuin_common::api::*;
 
 pub fn verify_str(secret: &str, verify: &str) -> bool {
     sodiumoxide::init().unwrap();
diff --git a/atuin-server/src/settings.rs b/atuin-server/src/settings.rs
index 6f4d36b4..8e8961e9 100644
--- a/atuin-server/src/settings.rs
+++ b/atuin-server/src/settings.rs
@@ -1,10 +1,9 @@
-use fs_err::{create_dir_all, File};
-use serde::{Deserialize, Serialize};
-use std::io::prelude::*;
-use std::path::PathBuf;
+use std::{io::prelude::*, path::PathBuf};
 
 use config::{Config, Environment, File as ConfigFile, FileFormat};
 use eyre::{eyre, Result};
+use fs_err::{create_dir_all, File};
+use serde::{Deserialize, Serialize};
 
 pub const HISTORY_PAGE_SIZE: i64 = 100;
 
-- 
cgit v1.3.1