aboutsummaryrefslogtreecommitdiffstats
path: root/atuin-server/src/handlers
diff options
context:
space:
mode:
authorConrad Ludgate <conradludgate@gmail.com>2024-01-28 13:33:45 +0000
committerGitHub <noreply@github.com>2024-01-28 13:33:45 +0000
commitbdcb143996567c9540fb411bc53448355665747b (patch)
treec8152a7cfdf0f2d45c5f7e15a17b577206698340 /atuin-server/src/handlers
parentchore: use resolver 2, update editions + cargo (#1635) (diff)
downloadatuin-bdcb143996567c9540fb411bc53448355665747b.zip
chore(deps): update axum (#1637)
Diffstat (limited to 'atuin-server/src/handlers')
-rw-r--r--atuin-server/src/handlers/history.rs5
-rw-r--r--atuin-server/src/handlers/mod.rs2
-rw-r--r--atuin-server/src/handlers/record.rs3
-rw-r--r--atuin-server/src/handlers/status.rs3
-rw-r--r--atuin-server/src/handlers/user.rs2
-rw-r--r--atuin-server/src/handlers/v0/record.rs3
6 files changed, 7 insertions, 11 deletions
diff --git a/atuin-server/src/handlers/history.rs b/atuin-server/src/handlers/history.rs
index cdee3988..05bbe740 100644
--- a/atuin-server/src/handlers/history.rs
+++ b/atuin-server/src/handlers/history.rs
@@ -2,10 +2,9 @@ use std::{collections::HashMap, convert::TryFrom};
use axum::{
extract::{Path, Query, State},
- http::HeaderMap,
+ http::{HeaderMap, StatusCode},
Json,
};
-use http::StatusCode;
use metrics::counter;
use time::{Month, UtcOffset};
use tracing::{debug, error, instrument};
@@ -215,7 +214,7 @@ pub async fn calendar<DB: Database>(
error: ErrorResponse {
reason: e.to_string().into(),
},
- status: http::StatusCode::BAD_REQUEST,
+ status: StatusCode::BAD_REQUEST,
})?;
let period = match focus {
diff --git a/atuin-server/src/handlers/mod.rs b/atuin-server/src/handlers/mod.rs
index b66a20bf..a10e622d 100644
--- a/atuin-server/src/handlers/mod.rs
+++ b/atuin-server/src/handlers/mod.rs
@@ -1,6 +1,6 @@
use atuin_common::api::{ErrorResponse, IndexResponse};
use atuin_server_database::Database;
-use axum::{extract::State, response::IntoResponse, Json};
+use axum::{extract::State, http, response::IntoResponse, Json};
use crate::router::AppState;
diff --git a/atuin-server/src/handlers/record.rs b/atuin-server/src/handlers/record.rs
index b5c07c5b..bf454949 100644
--- a/atuin-server/src/handlers/record.rs
+++ b/atuin-server/src/handlers/record.rs
@@ -1,5 +1,4 @@
-use axum::{response::IntoResponse, Json};
-use http::StatusCode;
+use axum::{http::StatusCode, response::IntoResponse, Json};
use serde_json::json;
use tracing::instrument;
diff --git a/atuin-server/src/handlers/status.rs b/atuin-server/src/handlers/status.rs
index d9b6afaf..3c22232c 100644
--- a/atuin-server/src/handlers/status.rs
+++ b/atuin-server/src/handlers/status.rs
@@ -1,5 +1,4 @@
-use axum::{extract::State, Json};
-use http::StatusCode;
+use axum::{extract::State, http::StatusCode, Json};
use tracing::instrument;
use super::{ErrorResponse, ErrorResponseStatus, RespExt};
diff --git a/atuin-server/src/handlers/user.rs b/atuin-server/src/handlers/user.rs
index 535c740f..fb281ab3 100644
--- a/atuin-server/src/handlers/user.rs
+++ b/atuin-server/src/handlers/user.rs
@@ -8,9 +8,9 @@ use argon2::{
};
use axum::{
extract::{Path, State},
+ http::StatusCode,
Json,
};
-use http::StatusCode;
use metrics::counter;
use rand::rngs::OsRng;
use tracing::{debug, error, info, instrument};
diff --git a/atuin-server/src/handlers/v0/record.rs b/atuin-server/src/handlers/v0/record.rs
index 438dd459..e1b5d29c 100644
--- a/atuin-server/src/handlers/v0/record.rs
+++ b/atuin-server/src/handlers/v0/record.rs
@@ -1,5 +1,4 @@
-use axum::{extract::Query, extract::State, Json};
-use http::StatusCode;
+use axum::{extract::Query, extract::State, http::StatusCode, Json};
use metrics::counter;
use serde::Deserialize;
use tracing::{error, instrument};