fix clippy warnings

Author: nickamzol

src/api/stow/service.rs

@@ -102,17 +102,17 @@ pub enum StoreError {
 impl IntoResponse for StoreError {
 	fn into_response(self) -> axum::response::Response {
 		match self {
-			StoreError::UploadLimitExceeded => Response::builder()
+			Self::UploadLimitExceeded => Response::builder()
 				.status(StatusCode::PAYLOAD_TOO_LARGE)
 				.body(Body::from("Upload limit exceeded"))
 				.unwrap(),
-			StoreError::Stream(err) => Response::builder()
+			Self::Stream(err) => Response::builder()
 				.status(StatusCode::BAD_REQUEST)
 				.body(Body::from(format!(
 					"Failed to read multipart stream: {err:#}"
 				)))
 				.unwrap(),
-			StoreError::ReadDicomFile(err) => Response::builder()
+			Self::ReadDicomFile(err) => Response::builder()
 				.status(StatusCode::BAD_REQUEST)
 				.body(Body::from(format!("Failed to read DICOM file: {err:#}")))
 				.unwrap(),
@@ -130,10 +130,10 @@ impl From<multer::Error> for StoreError {
 				.is_some();
 
 			if is_limit_exceeded {
-				return StoreError::UploadLimitExceeded;
+				return Self::UploadLimitExceeded;
 			}
 		}
 
-		StoreError::Stream(error)
+		Self::Stream(error)
 	}
 }

src/api/wado/routes.rs

@@ -84,7 +84,7 @@ async fn instance_resource(
 				Response::builder()
 					.header(
 						CONTENT_DISPOSITION,
-						format!(r#"attachment; filename="{study_instance_uid}""#,),
+						format!(r#"attachment; filename="{study_instance_uid}""#),
 					)
 					.header(
 						CONTENT_TYPE,

src/api/wado/service.rs

@@ -52,10 +52,10 @@ pub enum RetrieveError {
 impl IntoResponse for RetrieveError {
 	fn into_response(self) -> Response {
 		match self {
-			RetrieveError::Backend { source } => {
+			Self::Backend { source } => {
 				(StatusCode::INTERNAL_SERVER_ERROR, source.to_string()).into_response()
 			}
-			RetrieveError::Unimplemented => Response::builder()
+			Self::Unimplemented => Response::builder()
 				.status(StatusCode::NOT_IMPLEMENTED)
 				.body(Body::from("This transaction is not implemented."))
 				.unwrap(),

src/backend/dimse/cfind/findscu.rs

@@ -43,6 +43,7 @@ impl FindServiceClassUser {
 		Self { pool, timeout }
 	}
 
+	#[allow(clippy::significant_drop_tightening)]
 	pub fn invoke(
 		&self,
 		options: FindServiceClassUserOptions,

src/backend/dimse/cmove/movescu.rs

@@ -23,6 +23,7 @@ impl MoveServiceClassUser {
 	}
 
 	#[instrument(skip_all, name = "MOVE-SCU")]
+	#[allow(clippy::significant_drop_tightening)]
 	pub async fn invoke(&self, request: CompositeMoveRequest) -> Result<(), MoveError> {
 		let association = self
 			.pool

src/backend/dimse/cstore/storescu.rs

@@ -21,6 +21,7 @@ impl StoreServiceClassUser {
 		Self { pool, timeout }
 	}
 
+	#[allow(clippy::significant_drop_tightening)]
 	pub async fn store(&self, file: FileDicomObject<InMemDicomObject>) -> Result<(), StoreError> {
 		let association = self
 			.pool

src/backend/dimse/wado.rs

@@ -264,6 +264,7 @@ impl<'a> DicomMultipartStream<'a> {
 			+ Send
 			+ 'a,
 	) -> Self {
+		#[allow(clippy::result_large_err)]
 		let multipart_stream = stream
 			.map(|item| {
 				item.and_then(|object| {

src/main.rs

@@ -14,6 +14,7 @@ use crate::config::{AppConfig, HttpServerConfig};
 use crate::types::AE;
 use association::pool::AssociationPools;
 use axum::extract::{DefaultBodyLimit, Request};
+use axum::http::StatusCode;
 use axum::response::Response;
 use axum::ServiceExt;
 use std::net::SocketAddr;
@@ -143,9 +144,10 @@ async fn run(config: AppConfig) -> anyhow::Result<()> {
 				.on_response(trace::DefaultOnResponse::new().level(Level::INFO)),
 		)
 		.layer(DefaultBodyLimit::max(config.server.http.max_upload_size))
-		.layer(TimeoutLayer::new(Duration::from_secs(
-			config.server.http.request_timeout,
-		)))
+		.layer(TimeoutLayer::with_status_code(
+			StatusCode::REQUEST_TIMEOUT,
+			Duration::from_secs(config.server.http.request_timeout),
+		))
 		.with_state(app_state);
 
 	let app = NormalizePathLayer::trim_trailing_slash().layer(app);

tests/common/mod.rs

@@ -34,8 +34,7 @@ pub struct ServerProcess {
 
 impl ServerProcess {
 	fn spawn(config: &str) -> anyhow::Result<Self> {
-		let workdir =
-			std::env::temp_dir().join(format!("dicom-rst-{}", uuid::Uuid::new_v4().to_string()));
+		let workdir = std::env::temp_dir().join(format!("dicom-rst-{}", uuid::Uuid::new_v4()));
 		std::fs::create_dir_all(&workdir)?;
 		std::fs::write(workdir.join("config.yaml"), config)?;
 

tests/stow.rs

@@ -8,6 +8,7 @@ use dicom::object::open_file;
 use dicom_web::DicomWebError;
 use std::time::{Duration, Instant};
 
+#[allow(clippy::redundant_closure_for_method_calls)]
 #[tokio::test]
 async fn can_upload_study_instances() -> anyhow::Result<()> {
 	let config = "