aboutsummaryrefslogtreecommitdiffstats
path: root/atuin-server/src/router.rs
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/router.rs
parentchore: use resolver 2, update editions + cargo (#1635) (diff)
downloadatuin-bdcb143996567c9540fb411bc53448355665747b.zip
chore(deps): update axum (#1637)
Diffstat (limited to 'atuin-server/src/router.rs')
-rw-r--r--atuin-server/src/router.rs9
1 files changed, 4 insertions, 5 deletions
diff --git a/atuin-server/src/router.rs b/atuin-server/src/router.rs
index 500e1a29..8509058f 100644
--- a/atuin-server/src/router.rs
+++ b/atuin-server/src/router.rs
@@ -1,15 +1,14 @@
use async_trait::async_trait;
use atuin_common::api::{ErrorResponse, ATUIN_CARGO_VERSION, ATUIN_HEADER_VERSION};
use axum::{
- extract::FromRequestParts,
- http::Request,
+ extract::{FromRequestParts, Request},
+ http::{self, request::Parts},
middleware::Next,
response::{IntoResponse, Response},
routing::{delete, get, post},
Router,
};
use eyre::Result;
-use http::request::Parts;
use tower::ServiceBuilder;
use tower_http::trace::TraceLayer;
@@ -81,7 +80,7 @@ async fn teapot() -> impl IntoResponse {
(http::StatusCode::NOT_FOUND, "404 not found")
}
-async fn clacks_overhead<B>(request: Request<B>, next: Next<B>) -> Response {
+async fn clacks_overhead(request: Request, next: Next) -> Response {
let mut response = next.run(request).await;
let gnu_terry_value = "GNU Terry Pratchett, Kris Nova";
@@ -94,7 +93,7 @@ async fn clacks_overhead<B>(request: Request<B>, next: Next<B>) -> Response {
}
/// Ensure that we only try and sync with clients on the same major version
-async fn semver<B>(request: Request<B>, next: Next<B>) -> Response {
+async fn semver(request: Request, next: Next) -> Response {
let mut response = next.run(request).await;
response
.headers_mut()