adapt to changes in gix-config

Author: Byron

gitoxide-core/src/repository/config.rs

@@ -1,5 +1,5 @@
 use anyhow::{bail, Result};
-use gix::{bstr::BString, config::Key};
+use gix::{bstr::BString, config::AsKey};
 
 use crate::OutputFormat;
 
@@ -57,12 +57,12 @@ struct Filter {
 
 impl Filter {
     fn new(input: BString) -> Self {
-        match ((&input).section_name(), (&input).subsection_name()) {
-            (section, subsection) if !section.is_empty() => Filter {
-                name: section.into(),
-                subsection: subsection.map(ToOwned::to_owned),
+        match input.try_as_key() {
+            Some(key) => Filter {
+                name: key.section_name.into(),
+                subsection: key.subsection_name.map(ToOwned::to_owned),
             },
-            _ => Filter {
+            None => Filter {
                 name: input.to_string(),
                 subsection: None,
             },

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())
     }
 }