diff --git a/src/delete.rs b/src/delete.rs index 5aff824..49fdb04 100644 --- a/src/delete.rs +++ b/src/delete.rs @@ -1,13 +1,13 @@ use std::sync::{Arc, atomic::Ordering}; use axum::extract::{Query, State}; -use base64::{Engine, prelude::BASE64_URL_SAFE_NO_PAD}; +use base64::{Engine as _, prelude::BASE64_URL_SAFE_NO_PAD}; use bytes::{Buf, BytesMut}; use hmac::Mac; use http::StatusCode; use serde::Deserialize; -use crate::engine::update_hmac; +use crate::engine::{Engine, update_hmac}; #[derive(Deserialize)] pub struct DeleteRequest { @@ -17,7 +17,7 @@ pub struct DeleteRequest { } pub async fn delete( - State(engine): State>, + State(engine): State>, Query(req): Query, ) -> (StatusCode, &'static str) { let Some(mut hmac) = engine.deletion_hmac.clone() else { diff --git a/src/index.rs b/src/index.rs index d6cf6cf..852f6ff 100644 --- a/src/index.rs +++ b/src/index.rs @@ -2,8 +2,10 @@ use std::sync::{Arc, atomic::Ordering}; use axum::extract::State; +use crate::engine::Engine; + /// Show index status page with amount of uploaded files -pub async fn index(State(engine): State>) -> String { +pub async fn index(State(engine): State>) -> String { let count = engine.upl_count.load(Ordering::Relaxed); let motd = engine.cfg.motd.clone(); diff --git a/src/new.rs b/src/new.rs index 349c1fd..67d8777 100644 --- a/src/new.rs +++ b/src/new.rs @@ -8,7 +8,7 @@ use std::{ use axum::{ body::Body, extract::{Query, State}, - response::{IntoResponse, Response}, + response::{IntoResponse as _, Response}, }; use axum_extra::TypedHeader; use headers::ContentLength; @@ -17,7 +17,7 @@ use serde::Deserialize; use serde_with::{DurationSeconds, serde_as}; use tracing::error; -use crate::engine::ProcessOutcome; +use crate::engine::{Engine, ProcessOutcome}; fn default_keep_exif() -> bool { false @@ -40,7 +40,7 @@ pub struct NewRequest { /// The request handler for the /new path. /// This handles all new uploads. pub async fn new( - State(engine): State>, + State(engine): State>, Query(req): Query, TypedHeader(ContentLength(content_length)): TypedHeader, body: Body, diff --git a/src/view.rs b/src/view.rs index 6c7014a..d6f226c 100644 --- a/src/view.rs +++ b/src/view.rs @@ -12,7 +12,7 @@ use http::{HeaderValue, StatusCode}; use tokio_util::io::ReaderStream; use tracing::error; -use crate::engine::{GetOutcome, UploadData, UploadResponse}; +use crate::engine::{Engine, GetOutcome, UploadData, UploadResponse}; /// Responses for a failed view operation pub enum ViewError { @@ -88,7 +88,7 @@ impl IntoResponse for UploadResponse { /// GET request handler for /p/* path. /// All file views are handled here. pub async fn view( - State(engine): State>, + State(engine): State>, Path(original_path): Path, range: Option>, ) -> Result {