Merge pull request #2493 from GitoxideLabs/improvements

improvements

Author: Byron

gitoxide-core/src/repository/blame.rs

@@ -11,7 +11,7 @@ pub fn blame_file(
 ) -> anyhow::Result<()> {
     {
         let mut config = repo.config_snapshot_mut();
-        if config.string(&tree::Core::DELTA_BASE_CACHE_LIMIT).is_none() {
+        if config.string(tree::Core::DELTA_BASE_CACHE_LIMIT).is_none() {
             config.set_value(&tree::Core::DELTA_BASE_CACHE_LIMIT, "100m")?;
         }
     }

gitoxide-core/src/repository/config.rs

@@ -55,7 +55,7 @@ struct Filter {
 
 impl Filter {
     fn new(input: BString) -> Self {
-        match input.try_as_key() {
+        match (&input).try_as_key() {
             Some(key) => Filter {
                 name: key.section_name.into(),
                 subsection: key.subsection_name.map(ToOwned::to_owned),

gix-config/src/key.rs

@@ -1,7 +1,7 @@
 use bstr::{BStr, ByteSlice};
 
 /// Parse parts of a Git configuration key, like `remote.origin.url` or `core.bare`.
-pub trait AsKey {
+pub trait AsKey: Copy {
     /// Return a parsed key reference, containing all relevant parts of a key.
     /// For instance, `remote.origin.url` such key would yield access to `("remote", Some("origin"), "url")`
     /// while `user.name` would yield `("user", None, "name")`.
@@ -22,7 +22,7 @@ mod impls {
 
     use crate::key::{AsKey, KeyRef};
 
-    impl AsKey for String {
+    impl AsKey for &String {
         fn as_key(&self) -> KeyRef<'_> {
             self.try_as_key()
                 .unwrap_or_else(|| panic!("'{self}' is not a valid configuration key"))
@@ -44,7 +44,7 @@ mod impls {
         }
     }
 
-    impl AsKey for BString {
+    impl AsKey for &BString {
         fn as_key(&self) -> KeyRef<'_> {
             self.try_as_key()
                 .unwrap_or_else(|| panic!("'{self}' is not a valid configuration key"))

gix-submodule/src/access.rs

@@ -119,7 +119,7 @@ impl File {
     pub fn path(&self, name: &BStr) -> Result<Cow<'_, BStr>, config::path::Error> {
         let path_bstr =
             self.config
-                .string(format!("submodule.{name}.path"))
+                .string(&format!("submodule.{name}.path"))
                 .ok_or_else(|| config::path::Error::Missing {
                     submodule: name.to_owned(),
                 })?;
@@ -148,7 +148,7 @@ impl File {
     pub fn url(&self, name: &BStr) -> Result<gix_url::Url, config::url::Error> {
         let url = self
             .config
-            .string(format!("submodule.{name}.url"))
+            .string(&format!("submodule.{name}.url"))
             .ok_or_else(|| config::url::Error::Missing {
                 submodule: name.to_owned(),
             })?;
@@ -166,7 +166,7 @@ impl File {
 
     /// Retrieve the `update` field of the submodule named `name`, if present.
     pub fn update(&self, name: &BStr) -> Result<Option<Update>, config::update::Error> {
-        let value: Update = match self.config.string(format!("submodule.{name}.update")) {
+        let value: Update = match self.config.string(&format!("submodule.{name}.update")) {
             Some(v) => v.as_ref().try_into().map_err(|()| config::update::Error::Invalid {
                 submodule: name.to_owned(),
                 actual: v.into_owned(),
@@ -196,7 +196,7 @@ impl File {
     ///
     /// Note that `Default` is implemented for [`Branch`].
     pub fn branch(&self, name: &BStr) -> Result<Option<Branch>, config::branch::Error> {
-        let branch = match self.config.string(format!("submodule.{name}.branch")) {
+        let branch = match self.config.string(&format!("submodule.{name}.branch")) {
             Some(v) => v,
             None => return Ok(None),
         };
@@ -215,7 +215,7 @@ impl File {
     /// Note that if it's unset, it should be retrieved from `fetch.recurseSubmodules` in the configuration.
     pub fn fetch_recurse(&self, name: &BStr) -> Result<Option<FetchRecurse>, config::Error> {
         self.config
-            .boolean(format!("submodule.{name}.fetchRecurseSubmodules"))
+            .boolean(&format!("submodule.{name}.fetchRecurseSubmodules"))
             .map(FetchRecurse::new)
             .transpose()
             .map_err(|value| config::Error {
@@ -228,7 +228,7 @@ impl File {
     /// Retrieve the `ignore` field of the submodule named `name`, or `None` if unset.
     pub fn ignore(&self, name: &BStr) -> Result<Option<Ignore>, config::Error> {
         self.config
-            .string(format!("submodule.{name}.ignore"))
+            .string(&format!("submodule.{name}.ignore"))
             .map(|value| {
                 Ignore::try_from(value.as_ref()).map_err(|()| config::Error {
                     field: "ignore",
@@ -243,6 +243,6 @@ impl File {
     ///
     /// If `true`, the submodule will be checked out with `depth = 1`. If unset, `false` is assumed.
     pub fn shallow(&self, name: &BStr) -> Result<Option<bool>, gix_config::value::Error> {
-        self.config.boolean(format!("submodule.{name}.shallow")).transpose()
+        self.config.boolean(&format!("submodule.{name}.shallow")).transpose()
     }
 }

gix-submodule/src/is_active_platform.rs

@@ -34,7 +34,7 @@ impl IsActivePlatform {
             &mut gix_pathspec::attributes::search::Outcome,
         ) -> bool,
     ) -> Result<bool, gix_config::value::Error> {
-        if let Some(val) = config.boolean(format!("submodule.{name}.active")).transpose()? {
+        if let Some(val) = config.boolean(&format!("submodule.{name}.active")).transpose()? {
             return Ok(val);
         }
         if let Some(val) = self.search.as_mut().map(|search| {
@@ -44,6 +44,6 @@ impl IsActivePlatform {
         }) {
             return Ok(val);
         }
-        Ok(config.string(format!("submodule.{name}.url")).is_some())
+        Ok(config.string(&format!("submodule.{name}.url")).is_some())
     }
 }

gix/src/config/cache/access.rs

@@ -186,7 +186,7 @@ impl Cache {
             .user_agent
             .get_or_init(|| {
                 self.resolved
-                    .string(&Gitoxide::USER_AGENT)
+                    .string(Gitoxide::USER_AGENT)
                     .map_or_else(|| crate::env::agent().into(), |s| s.to_string())
             })
             .to_owned();
@@ -533,7 +533,7 @@ pub(crate) fn trusted_file_path<'config>(
     lenient_config: bool,
     environment: crate::open::permissions::Environment,
 ) -> Option<Result<Cow<'config, std::path::Path>, gix_config::path::interpolate::Error>> {
-    let path = config.path_filter(&key, filter)?;
+    let path = config.path_filter(key, filter)?;
 
     if lenient_config && path.is_empty() {
         let _key = key.as_key();

gix/src/config/cache/incubate.rs

@@ -74,7 +74,7 @@ impl StageOne {
             config.append(worktree_config);
         }
         let precompose_unicode = config
-            .boolean(&Core::PRECOMPOSE_UNICODE)
+            .boolean(Core::PRECOMPOSE_UNICODE)
             .map(|v| Core::PRECOMPOSE_UNICODE.enrich_error(v))
             .transpose()
             .with_leniency(lenient)

gix/src/config/snapshot/credential_helpers.rs

@@ -186,7 +186,7 @@ pub(super) mod function {
         let prompt_options = gix_prompt::Options {
             askpass: crate::config::cache::access::trusted_file_path(
                 config,
-                &Core::ASKPASS,
+                Core::ASKPASS,
                 &mut filter,
                 is_lenient_config,
                 environment,
@@ -195,7 +195,7 @@ pub(super) mod function {
             .ignore_empty()?
             .map(|c| Cow::Owned(c.into_owned())),
             mode: config
-                .boolean(&Credentials::TERMINAL_PROMPT)
+                .boolean(Credentials::TERMINAL_PROMPT)
                 .map(|val| Credentials::TERMINAL_PROMPT.enrich_error(val))
                 .transpose()
                 .with_leniency(is_lenient_config)?
@@ -210,7 +210,7 @@ pub(super) mod function {
                 // The default ssh implementation uses binaries that do their own auth, so our passwords aren't used.
                 query_user_only: url.scheme == gix_url::Scheme::Ssh,
                 stderr: config
-                    .boolean(&Credentials::HELPER_STDERR)
+                    .boolean(Credentials::HELPER_STDERR)
                     .map(|val| Credentials::HELPER_STDERR.enrich_error(val))
                     .transpose()
                     .with_leniency(is_lenient_config)?

gix/src/config/tree/keys.rs

@@ -14,6 +14,7 @@ use crate::{
 };
 
 /// Implements a value without any constraints, i.e. a any value.
+#[derive(Copy, Clone)]
 pub struct Any<T: Validate = validate::All> {
     /// The key of the value in the git configuration.
     pub name: &'static str,
@@ -148,7 +149,7 @@ impl<T: Validate> Key for Any<T> {
     }
 }
 
-impl<T: Validate> gix_config::AsKey for Any<T> {
+impl<T: Validate + Copy + Clone> gix_config::AsKey for Any<T> {
     fn as_key(&self) -> gix_config::KeyRef<'_> {
         self.try_as_key().expect("infallible")
     }
@@ -512,7 +513,7 @@ pub mod validate {
     };
 
     /// Everything is valid.
-    #[derive(Default)]
+    #[derive(Default, Copy, Clone)]
     pub struct All;
 
     impl Validate for All {
@@ -522,7 +523,7 @@ pub mod validate {
     }
 
     /// Assure that values that parse as git dates are valid.
-    #[derive(Default)]
+    #[derive(Default, Clone, Copy)]
     pub struct Time;
 
     impl Validate for Time {
@@ -534,7 +535,7 @@ pub mod validate {
     }
 
     /// Assure that values that parse as unsigned integers are valid.
-    #[derive(Default)]
+    #[derive(Default, Clone, Copy)]
     pub struct UnsignedInteger;
 
     impl Validate for UnsignedInteger {
@@ -550,7 +551,7 @@ pub mod validate {
     }
 
     /// Assure that values that parse as git booleans are valid.
-    #[derive(Default)]
+    #[derive(Default, Clone, Copy)]
     pub struct Boolean;
 
     impl Validate for Boolean {
@@ -561,7 +562,7 @@ pub mod validate {
     }
 
     /// Values that are git remotes, symbolic or urls
-    #[derive(Default)]
+    #[derive(Default, Clone, Copy)]
     pub struct RemoteName;
     impl Validate for RemoteName {
         fn validate(&self, value: &BStr) -> Result<(), Box<dyn std::error::Error + Send + Sync + 'static>> {
@@ -572,7 +573,7 @@ pub mod validate {
     }
 
     /// Values that are programs - everything is allowed.
-    #[derive(Default)]
+    #[derive(Default, Clone, Copy)]
     pub struct Program;
     impl Validate for Program {
         fn validate(&self, _value: &BStr) -> Result<(), Box<dyn std::error::Error + Send + Sync + 'static>> {
@@ -581,7 +582,7 @@ pub mod validate {
     }
 
     /// Values that are programs executables, everything is allowed.
-    #[derive(Default)]
+    #[derive(Default, Clone, Copy)]
     pub struct Executable;
     impl Validate for Executable {
         fn validate(&self, _value: &BStr) -> Result<(), Box<dyn std::error::Error + Send + Sync + 'static>> {
@@ -590,7 +591,7 @@ pub mod validate {
     }
 
     /// Values that parse as URLs.
-    #[derive(Default)]
+    #[derive(Default, Clone, Copy)]
     pub struct Url;
     impl Validate for Url {
         fn validate(&self, value: &BStr) -> Result<(), Box<dyn std::error::Error + Send + Sync + 'static>> {
@@ -600,7 +601,7 @@ pub mod validate {
     }
 
     /// Values that parse as ref-specs for pushing.
-    #[derive(Default)]
+    #[derive(Default, Clone, Copy)]
     pub struct PushRefSpec;
     impl Validate for PushRefSpec {
         fn validate(&self, value: &BStr) -> Result<(), Box<dyn std::error::Error + Send + Sync + 'static>> {
@@ -610,7 +611,7 @@ pub mod validate {
     }
 
     /// Values that parse as ref-specs for pushing.
-    #[derive(Default)]
+    #[derive(Default, Clone, Copy)]
     pub struct FetchRefSpec;
     impl Validate for FetchRefSpec {
         fn validate(&self, value: &BStr) -> Result<(), Box<dyn std::error::Error + Send + Sync + 'static>> {
@@ -620,6 +621,7 @@ pub mod validate {
     }
 
     /// Timeouts used for file locks.
+    #[derive(Clone, Copy)]
     pub struct LockTimeout;
     impl Validate for LockTimeout {
         fn validate(&self, value: &BStr) -> Result<(), Box<dyn std::error::Error + Send + Sync + 'static>> {
@@ -632,6 +634,7 @@ pub mod validate {
     }
 
     /// Durations in milliseconds.
+    #[derive(Clone, Copy)]
     pub struct DurationInMilliseconds;
     impl Validate for DurationInMilliseconds {
         fn validate(&self, value: &BStr) -> Result<(), Box<dyn std::error::Error + Send + Sync + 'static>> {
@@ -644,6 +647,7 @@ pub mod validate {
     }
 
     /// A UTF-8 string.
+    #[derive(Clone, Copy)]
     pub struct String;
     impl Validate for String {
         fn validate(&self, value: &BStr) -> Result<(), Box<dyn std::error::Error + Send + Sync + 'static>> {
@@ -653,6 +657,7 @@ pub mod validate {
     }
 
     /// Any path - everything is allowed.
+    #[derive(Clone, Copy)]
     pub struct Path;
     impl Validate for Path {
         fn validate(&self, _value: &BStr) -> Result<(), Box<dyn std::error::Error + Send + Sync + 'static>> {

gix/src/config/tree/sections/core.rs

@@ -442,6 +442,7 @@ mod abbrev {
 mod validate {
     use crate::{bstr::BStr, config::tree::keys};
 
+    #[derive(Clone, Copy)]
     pub struct Disambiguate;
     impl keys::Validate for Disambiguate {
         #[cfg_attr(not(feature = "revision"), allow(unused_variables))]
@@ -452,6 +453,7 @@ mod validate {
         }
     }
 
+    #[derive(Clone, Copy)]
     pub struct LogAllRefUpdates;
     impl keys::Validate for LogAllRefUpdates {
         fn validate(&self, value: &BStr) -> Result<(), Box<dyn std::error::Error + Send + Sync + 'static>> {
@@ -461,6 +463,7 @@ mod validate {
         }
     }
 
+    #[derive(Clone, Copy)]
     pub struct CheckStat;
     impl keys::Validate for CheckStat {
         fn validate(&self, value: &BStr) -> Result<(), Box<dyn std::error::Error + Send + Sync + 'static>> {
@@ -469,6 +472,7 @@ mod validate {
         }
     }
 
+    #[derive(Clone, Copy)]
     pub struct Abbrev;
     impl keys::Validate for Abbrev {
         fn validate(&self, value: &BStr) -> Result<(), Box<dyn std::error::Error + Send + Sync + 'static>> {
@@ -479,6 +483,7 @@ mod validate {
     }
 
     #[cfg(feature = "attributes")]
+    #[derive(Clone, Copy)]
     pub struct SafeCrlf;
     #[cfg(feature = "attributes")]
     impl keys::Validate for SafeCrlf {
@@ -489,6 +494,7 @@ mod validate {
     }
 
     #[cfg(feature = "attributes")]
+    #[derive(Clone, Copy)]
     pub struct AutoCrlf;
     #[cfg(feature = "attributes")]
     impl keys::Validate for AutoCrlf {
@@ -499,6 +505,7 @@ mod validate {
     }
 
     #[cfg(feature = "attributes")]
+    #[derive(Clone, Copy)]
     pub struct Eol;
     #[cfg(feature = "attributes")]
     impl keys::Validate for Eol {
@@ -509,6 +516,7 @@ mod validate {
     }
 
     #[cfg(feature = "attributes")]
+    #[derive(Clone, Copy)]
     pub struct CheckRoundTripEncoding;
     #[cfg(feature = "attributes")]
     impl keys::Validate for CheckRoundTripEncoding {