change!: conform APIs of file::MutableValue and file::MutableMultiValue. (#331)

There are more renames and removals than worth mentioning here given the
current adoption of the crate.

Author: Byron

git-config/src/file/access/raw.rs

@@ -185,7 +185,7 @@ impl<'event> File<'event> {
     ///     ]
     /// );
     ///
-    /// git_config.raw_values_mut("core", None, "a")?.set_str_all("g");
+    /// git_config.raw_values_mut("core", None, "a")?.set_all("g");
     ///
     /// assert_eq!(
     ///     git_config.raw_values("core", None, "a")?,
@@ -306,7 +306,7 @@ impl<'event> File<'event> {
         new_value: &BStr,
     ) -> Result<(), lookup::existing::Error> {
         self.raw_value_mut(section_name, subsection_name, key)
-            .map(|mut entry| entry.set_bytes(new_value))
+            .map(|mut entry| entry.set(new_value))
     }
 
     /// Sets a multivar in a given section, optional subsection, and key value.
@@ -344,9 +344,9 @@ impl<'event> File<'event> {
     /// # use bstr::BStr;
     /// # let mut git_config = git_config::File::try_from("[core]a=b\n[core]\na=c\na=d").unwrap();
     /// let new_values = vec![
-    ///     Cow::<BStr>::Borrowed("x".into()),
-    ///     Cow::<BStr>::Borrowed("y".into()),
-    ///     Cow::<BStr>::Borrowed("z".into()),
+    ///     "x".into(),
+    ///     "y".into(),
+    ///     "z".into(),
     /// ];
     /// git_config.set_raw_multi_value("core", None, "a", new_values.into_iter())?;
     /// let fetched_config = git_config.raw_values("core", None, "a")?;
@@ -365,8 +365,8 @@ impl<'event> File<'event> {
     /// # use bstr::BStr;
     /// # let mut git_config = git_config::File::try_from("[core]a=b\n[core]\na=c\na=d").unwrap();
     /// let new_values = vec![
-    ///     Cow::<BStr>::Borrowed("x".into()),
-    ///     Cow::<BStr>::Borrowed("y".into()),
+    ///     "x".into(),
+    ///     "y".into(),
     /// ];
     /// git_config.set_raw_multi_value("core", None, "a", new_values.into_iter())?;
     /// let fetched_config = git_config.raw_values("core", None, "a")?;
@@ -384,21 +384,21 @@ impl<'event> File<'event> {
     /// # use bstr::BStr;
     /// # let mut git_config = git_config::File::try_from("[core]a=b\n[core]\na=c\na=d").unwrap();
     /// let new_values = vec![
-    ///     Cow::<BStr>::Borrowed("x".into()),
-    ///     Cow::<BStr>::Borrowed("y".into()),
-    ///     Cow::<BStr>::Borrowed("z".into()),
-    ///     Cow::<BStr>::Borrowed("discarded".into()),
+    ///     "x".into(),
+    ///     "y".into(),
+    ///     "z".into(),
+    ///     "discarded".into(),
     /// ];
     /// git_config.set_raw_multi_value("core", None, "a", new_values)?;
     /// assert!(!git_config.raw_values("core", None, "a")?.contains(&Cow::<BStr>::Borrowed("discarded".into())));
     /// # Ok::<(), git_config::lookup::existing::Error>(())
     /// ```
-    pub fn set_raw_multi_value(
+    pub fn set_raw_multi_value<'a>(
         &mut self,
         section_name: &str,
         subsection_name: Option<&str>,
         key: &str,
-        new_values: impl IntoIterator<Item = Cow<'event, BStr>>,
+        new_values: impl IntoIterator<Item = &'a BStr>,
     ) -> Result<(), lookup::existing::Error> {
         self.raw_values_mut(section_name, subsection_name, key)
             .map(|mut v| v.set_values(new_values))

git-config/src/file/mutable/value.rs

@@ -31,13 +31,13 @@ impl<'borrow, 'lookup, 'event> MutableValue<'borrow, 'lookup, 'event> {
     /// the Value event(s) are replaced with a single new event containing the
     /// new value.
     pub fn set_string(&mut self, input: impl AsRef<str>) {
-        self.set_bytes(input.as_ref().into());
+        self.set(input.as_ref().into());
     }
 
     /// Update the value to the provided one. This modifies the value such that
     /// the Value event(s) are replaced with a single new event containing the
     /// new value.
-    pub fn set_bytes(&mut self, input: &BStr) {
+    pub fn set(&mut self, input: &BStr) {
         if self.size.0 > 0 {
             self.section.delete(self.index, self.index + self.size);
         }
@@ -132,25 +132,16 @@ impl<'borrow, 'lookup, 'event> MutableMultiValue<'borrow, 'lookup, 'event> {
     /// # Safety
     ///
     /// This will panic if the index is out of range.
-    pub fn set_string(&mut self, index: usize, input: String) {
-        self.set_bytes(index, input);
+    pub fn set_string_at(&mut self, index: usize, input: impl AsRef<str>) {
+        self.set_at(index, input.as_ref().into());
     }
 
     /// Sets the value at the given index.
     ///
     /// # Safety
     ///
     /// This will panic if the index is out of range.
-    pub fn set_bytes(&mut self, index: usize, input: impl Into<BString>) {
-        self.set_value(index, Cow::Owned(input.into()));
-    }
-
-    /// Sets the value at the given index.
-    ///
-    /// # Safety
-    ///
-    /// This will panic if the index is out of range.
-    pub fn set_value(&mut self, index: usize, input: Cow<'event, BStr>) {
+    pub fn set_at(&mut self, index: usize, input: &BStr) {
         let EntryData {
             section_id,
             offset_index,
@@ -172,7 +163,7 @@ impl<'borrow, 'lookup, 'event> MutableMultiValue<'borrow, 'lookup, 'event> {
     /// remaining values are ignored.
     ///
     /// [`zip`]: std::iter::Iterator::zip
-    pub fn set_values(&mut self, input: impl IntoIterator<Item = Cow<'event, BStr>>) {
+    pub fn set_values<'a>(&mut self, input: impl IntoIterator<Item = &'a BStr>) {
         for (
             EntryData {
                 section_id,
@@ -192,39 +183,14 @@ impl<'borrow, 'lookup, 'event> MutableMultiValue<'borrow, 'lookup, 'event> {
         }
     }
 
-    /// Sets all values in this multivar to the provided one by copying the
-    /// `input` string to all values.
-    pub fn set_str_all(&mut self, input: &str) {
-        self.set_owned_values_all(input);
-    }
-
-    /// Sets all values in this multivar to the provided one by copying the
-    /// `input` bytes to all values.
-    pub fn set_owned_values_all<'a>(&mut self, input: impl Into<&'a BStr>) {
-        let input = input.into();
-        for EntryData {
-            section_id,
-            offset_index,
-        } in &self.indices_and_sizes
-        {
-            Self::set_value_inner(
-                &self.key,
-                &mut self.offsets,
-                self.section.get_mut(section_id).expect("known section id"),
-                *section_id,
-                *offset_index,
-                Cow::Owned(input.to_owned()),
-            );
-        }
-    }
-
     /// Sets all values in this multivar to the provided one without owning the
     /// provided input. Consider using [`Self::set_owned_values_all`] or
     /// [`Self::set_str_all`] unless you have a strict performance or memory
     /// need for a more ergonomic interface.
     ///
     /// [`File`]: crate::File
-    pub fn set_values_all(&mut self, input: &'event BStr) {
+    pub fn set_all<'a>(&mut self, input: impl Into<&'a BStr>) {
+        let input = input.into();
         for EntryData {
             section_id,
             offset_index,
@@ -236,7 +202,7 @@ impl<'borrow, 'lookup, 'event> MutableMultiValue<'borrow, 'lookup, 'event> {
                 self.section.get_mut(section_id).expect("known section id"),
                 *section_id,
                 *offset_index,
-                Cow::Borrowed(input),
+                input,
             );
         }
     }
@@ -247,7 +213,7 @@ impl<'borrow, 'lookup, 'event> MutableMultiValue<'borrow, 'lookup, 'event> {
         section: &mut SectionBody<'event>,
         section_id: SectionBodyId,
         offset_index: usize,
-        value: Cow<'a, BStr>,
+        value: &BStr,
     ) {
         let (offset, size) = MutableMultiValue::index_and_size(offsets, section_id, offset_index);
         let whitespace: Whitespace<'_> = (&*section).into();
@@ -256,7 +222,7 @@ impl<'borrow, 'lookup, 'event> MutableMultiValue<'borrow, 'lookup, 'event> {
 
         let key_sep_events = whitespace.key_value_separators();
         MutableMultiValue::set_offset(offsets, section_id, offset_index, 2 + key_sep_events.len());
-        section.insert(offset, Event::Value(escape_value(value.as_ref()).into()));
+        section.insert(offset, Event::Value(escape_value(value).into()));
         section.insert_many(offset, key_sep_events.into_iter().rev());
         section.insert(offset, Event::SectionKey(key.to_owned()));
     }

git-config/tests/file/mutable/multi_value.rs

@@ -18,13 +18,17 @@ mod get {
 "100"
         [core]
             a=d\
-b
+"b  "\
+c
             a=f\
-a"#
+   a"#
         .parse()?;
 
         let mut values = config.raw_values_mut("core", None, "a")?;
-        assert_eq!(&*values.get()?, vec![cow_str("b100"), cow_str("db"), cow_str("fa"),]);
+        assert_eq!(
+            &*values.get()?,
+            vec![cow_str("b100"), cow_str("db  c"), cow_str("f   a"),]
+        );
 
         values.delete_all();
         assert!(values.get().is_err());
@@ -54,7 +58,7 @@ mod set {
         for value in ["a b", " a b", "a b\t", ";c", "#c", "a\nb\n\tc"] {
             let mut config = init_config();
             let mut values = config.raw_values_mut("core", None, "a")?;
-            values.set_values_all(value.into());
+            values.set_all(value);
 
             let config_str = config.to_string();
             let config: git_config::File = config_str.parse()?;
@@ -71,7 +75,7 @@ mod set {
     fn single_at_start() -> crate::Result {
         let mut config = init_config();
         let mut values = config.raw_values_mut("core", None, "a")?;
-        values.set_string(0, "Hello".into());
+        values.set_string_at(0, "Hello");
         assert_eq!(
             config.to_string(),
             "[core]\n    a = Hello\n    [core]\n        a =d\n        a= f"
@@ -83,7 +87,7 @@ mod set {
     fn single_at_end() -> crate::Result {
         let mut config = init_config();
         let mut values = config.raw_values_mut("core", None, "a")?;
-        values.set_string(2, "Hello".into());
+        values.set_string_at(2, "Hello");
         assert_eq!(
             config.to_string(),
             "[core]\n    a = b\"100\"\n    [core]\n        a =d\n        a= Hello"
@@ -95,7 +99,7 @@ mod set {
     fn all() -> crate::Result {
         let mut config = init_config();
         let mut values = config.raw_values_mut("core", None, "a")?;
-        values.set_owned_values_all("Hello");
+        values.set_all("Hello");
         assert_eq!(
             config.to_string(),
             "[core]\n    a = Hello\n    [core]\n        a= Hello\n        a =Hello"
@@ -107,7 +111,7 @@ mod set {
     fn all_empty() -> crate::Result {
         let mut config = init_config();
         let mut values = config.raw_values_mut("core", None, "a")?;
-        values.set_owned_values_all("");
+        values.set_all("");
         assert_eq!(
             config.to_string(),
             "[core]\n    a = \n    [core]\n        a= \n        a ="