refactor

-

Author: Byron

gitoxide-core/src/repository/fetch.rs

@@ -59,9 +59,8 @@ pub(crate) mod function {
         let mut remote = crate::repository::remote::by_name_or_url(&repo, remote.as_deref())?;
         let mut wants = Vec::new();
         let mut fetch_refspecs = Vec::new();
-        let expected_hex_len = repo.object_hash().len_in_hex();
         for spec in ref_specs {
-            if spec.len() == expected_hex_len {
+            if spec.len() == repo.object_hash().len_in_hex() {
                 if let Ok(oid) = ObjectId::from_hex(spec.as_ref()) {
                     wants.push(oid);
                     continue;

gix/src/clone/fetch/mod.rs

@@ -25,11 +25,6 @@ pub enum Error {
         source: crate::bstr::Utf8Error,
         remote_name: crate::bstr::BString,
     },
-    #[error("Configuration value name {name:?} is invalid")]
-    ConfigValueName {
-        name: &'static str,
-        source: gix_config::parse::section::value_name::Error,
-    },
     #[error(transparent)]
     ConfigSectionHeader(#[from] gix_config::parse::section::header::Error),
     #[error(transparent)]
@@ -218,7 +213,7 @@ impl PrepareFetch {
         let filter_spec_to_save = self
             .filter
             .as_ref()
-            .map(crate::remote::fetch::ObjectFilter::to_argument_string);
+            .map(remote::fetch::ObjectFilter::to_argument_string);
         let config =
             util::write_remote_to_local_config_file(&mut remote, remote_name.clone(), filter_spec_to_save.as_deref())?;
 

gix/src/clone/fetch/util.rs

@@ -38,25 +38,16 @@ pub fn write_remote_to_local_config_file(
         while remote_section.remove("partialclonefilter").is_some() {}
         while remote_section.remove("promisor").is_some() {}
 
-        let partial_clone_filter = ValueName::try_from("partialclonefilter").map_err(|err| Error::ConfigValueName {
-            name: "partialclonefilter",
-            source: err,
-        })?;
-        remote_section.push(partial_clone_filter, Some(BStr::new(filter_spec)));
+        let partial_clone_filter = ValueName::try_from("partialclonefilter").expect("known to be valid");
+        remote_section.push(partial_clone_filter, Some(filter_spec.into()));
 
-        let promisor = ValueName::try_from("promisor").map_err(|err| Error::ConfigValueName {
-            name: "promisor",
-            source: err,
-        })?;
-        remote_section.push(promisor, Some(BStr::new("true")));
+        let promisor = ValueName::try_from("promisor").expect("known to be valid");
+        remote_section.push(promisor, Some("true".into()));
 
         let mut extensions_section = config.section_mut_or_create_new("extensions", None)?;
-        while extensions_section.remove("partialclone").is_some() {}
+        while extensions_section.remove("partialClone").is_some() {}
 
-        let partial_clone = ValueName::try_from("partialclone").map_err(|err| Error::ConfigValueName {
-            name: "partialclone",
-            source: err,
-        })?;
+        let partial_clone = ValueName::try_from("partialClone").expect("known to be valid");
         extensions_section.push(partial_clone, Some(remote_name.as_ref()));
     }