From 1aedabb6c64108d2ea8cd9e4ba29690e4aa9e205 Mon Sep 17 00:00:00 2001 From: Jonas Platte Date: Tue, 10 May 2022 10:36:18 +0200 Subject: [PATCH] Remove code duplication across branches --- crates/static-files/src/lib.rs | 21 ++++++++------------- 1 file changed, 8 insertions(+), 13 deletions(-) diff --git a/crates/static-files/src/lib.rs b/crates/static-files/src/lib.rs index ea770ce5..ccf41a8a 100644 --- a/crates/static-files/src/lib.rs +++ b/crates/static-files/src/lib.rs @@ -68,21 +68,16 @@ mod builtin { let len = asset.data.len().try_into().unwrap(); let mime = mime_guess::from_path(path).first_or_octet_stream(); + let headers = ( + TypedHeader(ContentType::from(mime)), + TypedHeader(ContentLength(len)), + TypedHeader(etag), + ); + let res = if is_head { - ( - TypedHeader(ContentType::from(mime)), - TypedHeader(ContentLength(len)), - TypedHeader(etag), - ) - .into_response() + headers.into_response() } else { - ( - TypedHeader(ContentType::from(mime)), - TypedHeader(ContentLength(len)), - TypedHeader(etag), - asset.data, - ) - .into_response() + (headers, asset.data).into_response() }; Some(res)