From fd69069e3143d895a51c0621a134b334fc24b762 Mon Sep 17 00:00:00 2001 From: Rutger Broekhoff Date: Fri, 20 Feb 2026 19:04:13 +0100 Subject: Consistent use of format! and friends etc. --- gitolfs3-server/src/api.rs | 9 ++------- gitolfs3-server/src/handler.rs | 8 ++++---- 2 files changed, 6 insertions(+), 11 deletions(-) (limited to 'gitolfs3-server/src') diff --git a/gitolfs3-server/src/api.rs b/gitolfs3-server/src/api.rs index 72ef8c6..b80c83a 100644 --- a/gitolfs3-server/src/api.rs +++ b/gitolfs3-server/src/api.rs @@ -168,20 +168,15 @@ fn default_transfers() -> Vec { vec![TransferAdapter::Basic] } -#[derive(Debug, Serialize, Deserialize, PartialEq, Eq, Clone, Copy)] +#[derive(Default, Debug, Serialize, Deserialize, PartialEq, Eq, Clone, Copy)] pub enum HashAlgo { + #[default] #[serde(rename = "sha256")] Sha256, #[serde(other)] Unknown, } -impl Default for HashAlgo { - fn default() -> Self { - Self::Sha256 - } -} - #[derive(Debug, Serialize, Clone)] pub struct BatchResponse { pub transfer: TransferAdapter, diff --git a/gitolfs3-server/src/handler.rs b/gitolfs3-server/src/handler.rs index ee52a31..1f47c9e 100644 --- a/gitolfs3-server/src/handler.rs +++ b/gitolfs3-server/src/handler.rs @@ -88,7 +88,7 @@ async fn handle_download_object( trusted: bool, ) -> BatchResponseObject { let (oid0, oid1) = (HexByte(obj.oid[0]), HexByte(obj.oid[1])); - let full_path = format!("{repo}/lfs/objects/{}/{}/{}", oid0, oid1, obj.oid); + let full_path = format!("{repo}/lfs/objects/{oid0}/{oid1}/{}", obj.oid); let content_length = match state.check_object(repo, obj).await { Ok(ObjectStatus::ExistsOk { content_length }) => content_length, @@ -267,7 +267,7 @@ pub async fn handle_obj_download( return e.into_response(); } - let full_path = format!("{repo}/lfs/objects/{}/{}/{}", oid0, oid1, oid); + let full_path = format!("{repo}/lfs/objects/{oid0}/{oid1}/{oid}"); let result = match state .s3_client .get_object() @@ -285,7 +285,7 @@ pub async fn handle_obj_download( "Failed to query object information", ) .into_response(); - }, + } Err(e) => { println!("Failed to GetObject (repo {repo}, OID {oid}): {e}"); return ( @@ -324,7 +324,7 @@ async fn handle_upload_object( obj: &BatchRequestObject, ) -> Option { let (oid0, oid1) = (HexByte(obj.oid[0]), HexByte(obj.oid[1])); - let full_path = format!("{repo}/lfs/objects/{}/{}/{}", oid0, oid1, obj.oid); + let full_path = format!("{repo}/lfs/objects/{oid0}/{oid1}/{}", obj.oid); match state.check_object(repo, obj).await { Ok(ObjectStatus::ExistsOk { .. }) => { -- cgit v1.2.3