Consistent use of format! and friends etc.HEADmain

3 files changed, 8 insertions, 13 deletions

diff --git a/gitolfs3-authenticate/src/main.rs b/gitolfs3-authenticate/src/main.rs
index 1195b1c..bd44394 100644
--- a/gitolfs3-authenticate/src/main.rs
+++ b/gitolfs3-authenticate/src/main.rs
@@ -49,9 +49,9 @@ fn main() -> ExitCode {
             ),
         },
         "expires_at": expires_at.to_rfc3339_opts(chrono::SecondsFormat::Secs, true),
-        "href": format!("{}{}/info/lfs", config.href_base, repo_name),
+        "href": format!("{}{repo_name}/info/lfs", config.href_base),
     });
-    println!("{}", response);
+    println!("{response}");
 
     ExitCode::SUCCESS
 }
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<TransferAdapter> {
     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<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);
 
     match state.check_object(repo, obj).await {
         Ok(ObjectStatus::ExistsOk { .. }) => {