Merge branch 'config-key'

Author: Byron

gitoxide-core/src/organize.rs

@@ -96,7 +96,7 @@ fn find_origin_remote(repo: &Path) -> anyhow::Result<Option<gix_url::Url>> {
     let config = gix::config::File::from_path_no_includes(non_bare.as_path().into(), local)
         .or_else(|_| gix::config::File::from_path_no_includes(repo.join("config"), local))?;
     Ok(config
-        .string_by_key("remote.origin.url")
+        .string("remote.origin.url")
         .map(|url| gix_url::Url::from_bytes(url.as_ref()))
         .transpose()?)
 }

gitoxide-core/src/repository/config.rs

@@ -1,5 +1,5 @@
 use anyhow::{bail, Result};
-use gix::bstr::{BStr, BString};
+use gix::{bstr::BString, config::AsKey};
 
 use crate::OutputFormat;
 
@@ -57,7 +57,7 @@ struct Filter {
 
 impl Filter {
     fn new(input: BString) -> Self {
-        match gix::config::parse::key(<_ as AsRef<BStr>>::as_ref(&input)) {
+        match input.try_as_key() {
             Some(key) => Filter {
                 name: key.section_name.into(),
                 subsection: key.subsection_name.map(ToOwned::to_owned),

gix-config/fuzz/fuzz_targets/fuzz_file.rs

@@ -17,7 +17,7 @@ fn fuzz_immutable_section(section: &gix_config::file::Section<'_>, buf: &mut Vec
         let _ = black_box((key, value));
     }
     let mut seen = BTreeSet::new();
-    for key in section.keys() {
+    for key in section.value_names() {
         if seen.insert(key) {
             let _ = black_box(section.values(key.as_ref()));
         }
@@ -37,7 +37,7 @@ fn fuzz_mutable_section(
     // Mutate section.
     let section_id = {
         let mut section = file.section_mut(section_name, subsection_name)?;
-        let key = section.keys().next().cloned();
+        let key = section.value_names().next().cloned();
 
         if let Some(key) = key {
             section.push_newline();

gix-config/src/file/access/comfort.rs

@@ -172,7 +172,7 @@ impl<'event> File<'event> {
     /// # use gix_config::parse::section;
     /// let mut git_config = gix_config::File::default();
     /// let mut section = git_config.new_section("hello", Some(Cow::Borrowed("world".into())))?;
-    /// section.push(section::Key::try_from("a")?, Some("b".into()));
+    /// section.push(section::ValueName::try_from("a")?, Some("b".into()));
     /// let nl = section.newline().to_owned();
     /// assert_eq!(git_config.to_string(), format!("[hello \"world\"]{nl}\ta = b{nl}"));
     /// let _section = git_config.new_section("core", None);