Cargo.toml

@@ -16,7 +16,7 @@ serde = ["serde_crate"]
 [dependencies]
 bstr = "0.2.15"
 nom = { version = "6", default_features = false, features = ["std"] }
-serde_crate = { version = "1", package = "serde", optional = true }
+serde_crate = { version = "1", package = "serde", optional = true}
 
 [dev-dependencies]
 serde_derive = "1.0"

src/values.rs

@@ -9,19 +9,13 @@ use std::fmt::Display;
 use std::str::FromStr;
 
 /// Removes quotes, if any, from the provided inputs. This assumes the input
-/// contains a even number of unescaped quotes, and will unescape escaped
+/// contains a even number of unescaped quotes, and will unescape escaped quotes.
-/// quotes. The return values should be safe for value interpretation.
+/// The return values should be safe for value interpretation.
 ///
 /// This has optimizations for fully-quoted values, where the returned value
 /// will be a borrowed reference if the only mutation necessary is to unquote
 /// the value.
 ///
-/// This is the function used to normalize raw values from higher level
-/// abstractions over the [`parser`] implementation. Generally speaking these
-/// high level abstractions will handle normalization for you, and you do not
-/// need to call this yourself. However, if you're directly handling events
-/// from the parser, you may want to use this to help with value interpretation.
-///
 /// # Examples
 ///
 /// Values don't need modification are returned borrowed, without allocation.
@@ -55,8 +49,6 @@ use std::str::FromStr;
 /// # use git_config::values::normalize;
 /// assert_eq!(normalize(br#"hello "world\"""#), Cow::<[u8]>::Owned(br#"hello world""#.to_vec()));
 /// ```
-///
-/// [`parser`]: crate::parser::Parser
 pub fn normalize(input: &[u8]) -> Cow<'_, [u8]> {
     let mut first_index = 0;
     let mut last_index = 0;
@@ -67,8 +59,10 @@ pub fn normalize(input: &[u8]) -> Cow<'_, [u8]> {
         return Cow::Borrowed(&[]);
     }
 
-    if size >= 3 && input[0] == b'=' && input[size - 1] == b'=' && input[size - 2] != b'\\' {
+    if size >= 3 {
-        return normalize(&input[1..size]);
+        if input[0] == b'=' && input[size - 1] == b'=' && input[size - 2] != b'\\' {
+            return normalize(&input[1..size]);
+        }
     }
 
     let mut owned = vec![];
@@ -124,6 +118,18 @@ pub enum Value<'a> {
     Other(Cow<'a, BStr>),
 }
 
+impl<'a> Value<'a> {
+    pub fn from_string(s: String) -> Self {
+        Self::Other(Cow::Owned(s.into()))
+    }
+}
+
+#[derive(Copy, Clone, Eq, PartialEq, Ord, PartialOrd, Hash, Debug)]
+pub enum ValueEventConversionError {
+    ValueNotDone,
+    NoValue,
+}
+
 impl<'a> From<&'a str> for Value<'a> {
     fn from(s: &'a str) -> Self {
         if let Ok(bool) = Boolean::try_from(s) {
@@ -153,6 +159,12 @@ impl<'a> From<&'a [u8]> for Value<'a> {
     }
 }
 
+// impl From<Vec<u8>> for Value<'_> {
+//     fn from(_: Vec<u8>) -> Self {
+//         todo!()
+//     }
+// }
+
 // todo display for value
 
 #[cfg(feature = "serde")]
@@ -170,16 +182,7 @@ impl Serialize for Value<'_> {
     }
 }
 
-/// Any value that can be interpreted as a boolean.
-///
-/// Note that while values can effectively be any byte string, the `git-config`
-/// documentation has a strict subset of values that may be interpreted as a
-/// boolean value, all of which are ASCII and thus UTF-8 representable.
-/// Consequently, variants hold [`str`]s rather than [`BStr`]s.
-///
-/// [`BStr`]: bstr::BStr
 #[derive(Copy, Clone, Eq, PartialEq, Ord, PartialOrd, Hash, Debug)]
-#[allow(missing_docs)]
 pub enum Boolean<'a> {
     True(TrueVariant<'a>),
     False(&'a str),
@@ -245,14 +248,13 @@ impl Serialize for Boolean<'_> {
     }
 }
 
-/// Discriminating enum between implicit and explicit truthy values.
-///
-/// This enum is part of the [`Boolean`] struct.
 #[derive(Copy, Clone, Eq, PartialEq, Ord, PartialOrd, Hash, Debug)]
-#[allow(missing_docs)]
 pub enum TrueVariant<'a> {
     Explicit(&'a str),
-    /// For values defined without a `= <value>`.
+    /// For variables defined without a `= <value>`. This can never be created
+    /// from the [`FromStr`] trait, as an empty string is false without context.
+    /// If directly serializing this struct (instead of using a higher level
+    /// wrapper), then this variant is serialized as if it was `true`.
     Implicit,
 }
 
@@ -302,17 +304,6 @@ impl Serialize for TrueVariant<'_> {
     }
 }
 
-/// Any value that can be interpreted as an integer.
-///
-/// This supports any numeric value that can fit in a [`i64`], excluding the
-/// suffix. The suffix is parsed separately from the value itself, so if you
-/// wish to obtain the true value of the integer, you must account for the
-/// suffix after fetching the value. [`IntegerSuffix`] provides
-/// [`bitwise_offset`] to help with the math, but do be warned that if the value
-/// is very large, you may run into overflows.
-///
-/// [`BStr`]: bstr::BStr
-/// [`bitwise_offset`]: IntegerSuffix::bitwise_offset
 #[derive(Copy, Clone, Eq, PartialEq, Ord, PartialOrd, Hash, Debug)]
 pub struct Integer {
     value: i64,
@@ -381,24 +372,20 @@ impl TryFrom<&[u8]> for Integer {
     }
 }
 
-/// Integer prefixes that are supported by `git-config`.
-///
-/// These values are base-2 unit of measurements, not the base-10 variants.
 #[derive(Copy, Clone, Eq, PartialEq, Ord, PartialOrd, Hash, Debug)]
-#[allow(missing_docs)]
 pub enum IntegerSuffix {
-    Kibi,
+    Kilo,
-    Mebi,
+    Mega,
-    Gibi,
+    Giga,
 }
 
 impl IntegerSuffix {
     /// Returns the number of bits that the suffix shifts left by.
     pub fn bitwise_offset(&self) -> usize {
         match self {
-            Self::Kibi => 10,
+            Self::Kilo => 10,
-            Self::Mebi => 20,
+            Self::Mega => 20,
-            Self::Gibi => 30,
+            Self::Giga => 30,
         }
     }
 }
@@ -406,9 +393,9 @@ impl IntegerSuffix {
 impl Display for IntegerSuffix {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         match self {
-            Self::Kibi => write!(f, "k"),
+            Self::Kilo => write!(f, "k"),
-            Self::Mebi => write!(f, "m"),
+            Self::Mega => write!(f, "m"),
-            Self::Gibi => write!(f, "g"),
+            Self::Giga => write!(f, "g"),
         }
     }
 }
@@ -420,9 +407,9 @@ impl Serialize for IntegerSuffix {
         S: Serializer,
     {
         serializer.serialize_str(match self {
-            Self::Kibi => "k",
+            Self::Kilo => "k",
-            Self::Mebi => "m",
+            Self::Mega => "m",
-            Self::Gibi => "g",
+            Self::Giga => "g",
         })
     }
 }
@@ -432,9 +419,9 @@ impl FromStr for IntegerSuffix {
 
     fn from_str(s: &str) -> Result<Self, Self::Err> {
         match s {
-            "k" => Ok(Self::Kibi),
+            "k" => Ok(Self::Kilo),
-            "m" => Ok(Self::Mebi),
+            "m" => Ok(Self::Mega),
-            "g" => Ok(Self::Gibi),
+            "g" => Ok(Self::Giga),
             _ => Err(()),
         }
     }
@@ -448,13 +435,6 @@ impl TryFrom<&[u8]> for IntegerSuffix {
     }
 }
 
-/// Any value that may contain a foreground color, background color, a
-/// collection of color (text) modifiers, or a combination of any of the
-/// aforementioned values.
-///
-/// Note that `git-config` allows color values to simply be a collection of
-/// [`ColorAttribute`]s, and does not require a [`ColorValue`] for either the
-/// foreground or background color.
 #[derive(Clone, Eq, PartialEq, Ord, PartialOrd, Hash, Debug, Default)]
 pub struct Color {
     foreground: Option<ColorValue>,
@@ -462,23 +442,6 @@ pub struct Color {
     attributes: Vec<ColorAttribute>,
 }
 
-impl Color {
-    /// Returns the foreground color, if any.
-    pub fn foreground(&self) -> Option<ColorValue> {
-        self.foreground
-    }
-
-    /// Returns the background color, if any.
-    pub fn background(&self) -> Option<ColorValue> {
-        self.background
-    }
-
-    /// Returns the list of text modifiers, if any.
-    pub fn attributes(&self) -> &[ColorAttribute] {
-        &self.attributes
-    }
-}
-
 impl Display for Color {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         if let Some(fg) = self.foreground {
@@ -508,16 +471,13 @@ impl Serialize for Color {
     }
 }
 
-/// Discriminating enum for [`Color`] parsing.
+pub enum FromColorErr {
-pub enum ColorParseError {
-    /// Too many primary colors were provided.
     TooManyColorValues,
-    /// An invalid color value or attribute was provided.
     InvalidColorOption,
 }
 
 impl FromStr for Color {
-    type Err = ColorParseError;
+    type Err = FromColorErr;
 
     fn from_str(s: &str) -> Result<Self, Self::Err> {
         enum ColorItem {
@@ -547,12 +507,12 @@ impl FromStr for Color {
                         } else if new_self.background.is_none() {
                             new_self.background = Some(v);
                         } else {
-                            return Err(ColorParseError::TooManyColorValues);
+                            return Err(FromColorErr::TooManyColorValues);
                         }
                     }
                     ColorItem::Attr(a) => new_self.attributes.push(a),
                 },
-                Err(_) => return Err(ColorParseError::InvalidColorOption),
+                Err(_) => return Err(FromColorErr::InvalidColorOption),
             }
         }
 
@@ -568,13 +528,8 @@ impl TryFrom<&[u8]> for Color {
     }
 }
 
-/// Discriminating enum for [`Color`] values.
-///
-/// `git-config` supports the eight standard colors, their bright variants, an
-/// ANSI color code, or a 24-bit hex value prefixed with an octothorpe.
 #[derive(Copy, Clone, Eq, PartialEq, Ord, PartialOrd, Hash, Debug)]
-#[allow(missing_docs)]
+enum ColorValue {
-pub enum ColorValue {
     Normal,
     Black,
     BrightBlack,
@@ -696,13 +651,7 @@ impl TryFrom<&[u8]> for ColorValue {
     }
 }
 
-/// Discriminating enum for [`Color`] attributes.
-///
-/// `git-config` supports modifiers and their negators. The negating color
-/// attributes are equivalent to having a `no` or `no-` prefix to the normal
-/// variant.
 #[derive(Copy, Clone, Eq, PartialEq, Ord, PartialOrd, Hash, Debug)]
-#[allow(missing_docs)]
 pub enum ColorAttribute {
     Bold,
     NoBold,
@@ -946,7 +895,7 @@ mod integer {
             Integer::from_str("1k").unwrap(),
             Integer {
                 value: 1,
-                suffix: Some(IntegerSuffix::Kibi),
+                suffix: Some(IntegerSuffix::Kilo),
             }
         );
 
@@ -954,7 +903,7 @@ mod integer {
             Integer::from_str("1m").unwrap(),
             Integer {
                 value: 1,
-                suffix: Some(IntegerSuffix::Mebi),
+                suffix: Some(IntegerSuffix::Mega),
             }
         );
 
@@ -962,7 +911,7 @@ mod integer {
             Integer::from_str("1g").unwrap(),
             Integer {
                 value: 1,
-                suffix: Some(IntegerSuffix::Gibi),
+                suffix: Some(IntegerSuffix::Giga),
             }
         );
     }