Cargo.lock

@@ -1,7 +1,6 @@
 # This file is automatically @generated by Cargo.
 # It is not intended for manual editing.
-version = 3
-
 [[package]]
 name = "estring"
-version = "0.2.1"
+version = "0.1.2"
+

Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "estring"
 description = "A simple way to parse a string using type annotations"
-version = "0.2.1"
+version = "0.2.0"
 edition = "2021"
 authors = ["Dmitriy Pleshevskiy <dmitriy@ideascup.me>"]
 readme = "README.md"
@@ -28,7 +28,7 @@ maintenance = { status = "actively-developed" }
 
 [[example]]
 name = "calc"
-required-features = ["structs", "aggs"]
+required-features = ["structs"]
 
 [[example]]
 name = "dotenv"

README.md

@@ -7,7 +7,7 @@
 
 ```toml
 [dependencies]
-estring = "0.2"
+estring = "0.1"
 ```
 
 A simple way to parse a string using type annotations.

examples/calc.rs

@@ -1,12 +1,14 @@
-use estring::{Aggregate, EString, Product, SepVec, Sum};
+use estring::{EString, SepVec};
 
 type PlusVec<T> = SepVec<T, '+'>;
 type MulVec<T> = SepVec<T, '*'>;
 
 fn main() -> estring::Result<()> {
     let res = EString::from("10+5*2+3")
-        .parse::<Sum<PlusVec<Product<MulVec<f32>>>>>()?
+        .parse::<PlusVec<MulVec<f32>>>()?
-        .agg();
+        .iter()
+        .map(|m| m.iter().product::<f32>())
+        .sum::<f32>();
 
     assert_eq!(res, 23.0);
     Ok(())

src/agg.rs

@@ -1,8 +1,2 @@
 //! This module will contain aggregate functions (Sum, Product, etc)
 //!
-
-mod product;
-mod sum;
-
-pub use product::*;
-pub use sum::*;

src/agg/product.rs

@@ -1,92 +0,0 @@
-use crate::{Aggregatable, Aggregate, EString, ParseFragment};
-
-/// Aggregate struct, that can multiply inner aggregatable [items](Aggregatable::items) if
-/// [``Aggregatable::Item``] implements [``std::iter::Product``](std::iter::Product)
-///
-/// # Examples
-///
-/// ```rust
-/// use estring::{Aggregate, EString, SepVec, Product};
-/// let res = EString::from("1*2*3*4")
-///     .parse::<Product<SepVec<i32, '*'>>>()
-///     .unwrap()
-///     .agg();
-/// assert_eq!(res, 24);
-/// ```
-#[derive(Debug, PartialEq, Eq)]
-pub struct Product<T>(pub T);
-
-impl<T> ParseFragment for Product<T>
-where
-    T: ParseFragment,
-{
-    fn parse_frag(es: EString) -> crate::Result<Self> {
-        T::parse_frag(es).map(Self)
-    }
-}
-
-impl<R, T> Aggregate for Product<T>
-where
-    R: std::iter::Product,
-    T: Aggregatable<Item = R>,
-{
-    type Target = R;
-
-    fn agg(self) -> Self::Target {
-        self.0.items().into_iter().product()
-    }
-}
-
-impl<R, T> Aggregatable for Product<T>
-where
-    R: std::iter::Product,
-    T: Aggregatable<Item = R>,
-{
-    type Item = R;
-
-    fn items(self) -> Vec<Self::Item> {
-        vec![self.agg()]
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use crate::SepVec;
-
-    use super::*;
-
-    type CommaVec<T> = SepVec<T, ','>;
-    type MulVec<T> = SepVec<T, '*'>;
-
-    #[test]
-    fn should_parse_vec() {
-        let es = EString::from("1,2,3");
-        match es.parse::<Product<CommaVec<i32>>>() {
-            Ok(res) => assert_eq!(res, Product(CommaVec::from(vec![1, 2, 3]))),
-            _ => unreachable!(),
-        }
-    }
-
-    #[test]
-    fn should_aggregate_vector() {
-        let es = EString::from("1,2,3");
-        let expr = es.parse::<Product<CommaVec<i32>>>().unwrap();
-        assert_eq!(expr.agg(), 6);
-    }
-
-    #[test]
-    fn should_aggregate_vector_with_inner_vector() {
-        let es = EString::from("1*2,2,3");
-        let expr = es.parse::<Product<CommaVec<MulVec<i32>>>>().unwrap();
-        assert_eq!(expr.agg(), 12);
-    }
-
-    #[test]
-    fn should_aggregate_vector_with_inner_aggregation() {
-        let es = EString::from("1*2,2,3");
-        let expr = es
-            .parse::<Product<CommaVec<Product<MulVec<i32>>>>>()
-            .unwrap();
-        assert_eq!(expr.agg(), 12);
-    }
-}

src/agg/sum.rs

@@ -1,90 +0,0 @@
-use crate::{Aggregatable, Aggregate, EString, ParseFragment};
-
-/// Aggregate struct, that can sum inner aggregatable [items](Aggregatable::items) if
-/// [``Aggregatable::Item``] implements [``std::iter::Sum``](std::iter::Sum)
-///
-/// # Examples
-///
-/// ```rust
-/// use estring::{Aggregate, EString, SepVec, Sum};
-/// let res = EString::from("1+2+3+4")
-///     .parse::<Sum<SepVec<i32, '+'>>>()
-///     .unwrap()
-///     .agg();
-/// assert_eq!(res, 10);
-/// ```
-#[derive(Debug, PartialEq, Eq)]
-pub struct Sum<T>(pub T);
-
-impl<T> ParseFragment for Sum<T>
-where
-    T: ParseFragment,
-{
-    fn parse_frag(es: EString) -> crate::Result<Self> {
-        T::parse_frag(es).map(Self)
-    }
-}
-
-impl<R, T> Aggregate for Sum<T>
-where
-    R: std::iter::Sum,
-    T: Aggregatable<Item = R>,
-{
-    type Target = R;
-
-    fn agg(self) -> Self::Target {
-        self.0.items().into_iter().sum()
-    }
-}
-
-impl<R, T> Aggregatable for Sum<T>
-where
-    R: std::iter::Sum,
-    T: Aggregatable<Item = R>,
-{
-    type Item = R;
-
-    fn items(self) -> Vec<Self::Item> {
-        vec![self.agg()]
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use crate::SepVec;
-
-    use super::*;
-
-    type CommaVec<T> = SepVec<T, ','>;
-    type PlusVec<T> = SepVec<T, '+'>;
-
-    #[test]
-    fn should_parse_vec() {
-        let es = EString::from("1,2,3");
-        match es.parse::<Sum<CommaVec<i32>>>() {
-            Ok(res) => assert_eq!(res, Sum(CommaVec::from(vec![1, 2, 3]))),
-            _ => unreachable!(),
-        }
-    }
-
-    #[test]
-    fn should_aggregate_vector() {
-        let es = EString::from("1,2,3");
-        let expr = es.parse::<Sum<CommaVec<i32>>>().unwrap();
-        assert_eq!(expr.agg(), 6);
-    }
-
-    #[test]
-    fn should_aggregate_vector_with_inner_vector() {
-        let es = EString::from("1+2,2,3");
-        let expr = es.parse::<Sum<CommaVec<PlusVec<i32>>>>().unwrap();
-        assert_eq!(expr.agg(), 8);
-    }
-
-    #[test]
-    fn should_aggregate_vector_with_inner_aggregation() {
-        let es = EString::from("1+2,2,3");
-        let expr = es.parse::<Sum<CommaVec<Sum<PlusVec<i32>>>>>().unwrap();
-        assert_eq!(expr.agg(), 8);
-    }
-}

src/core.rs

@@ -110,29 +110,6 @@ pub trait ParseFragment: Sized {
     fn parse_frag(es: EString) -> crate::Result<Self>;
 }
 
-// TODO: add example
-/// Trait to represent structures that can act as aggregators.
-///
-/// The `agg` method works with data that has already been parsed. For this reason, **this trait
-/// should never fail**.
-pub trait Aggregate {
-    /// The resulting type after aggregation.
-    type Target: ?Sized;
-
-    /// Aggregates the value.
-    fn agg(self) -> Self::Target;
-}
-
-// TODO: add example
-/// Trait to represent structures that can iterate values for the aggregator.
-pub trait Aggregatable {
-    /// The type of the elements being iterated over.
-    type Item;
-
-    /// Returns Vec of aggregatable values
-    fn items(self) -> Vec<Self::Item>;
-}
-
 /// Wrapper under ``String`` type.
 ///
 /// # Examples
@@ -240,15 +217,6 @@ impl ParseFragment for EString {
     }
 }
 
-impl Aggregatable for EString {
-    type Item = Self;
-
-    #[inline]
-    fn items(self) -> Vec<Self::Item> {
-        vec![self]
-    }
-}
-
 impl ParseFragment for String {
     #[inline]
     fn parse_frag(es: EString) -> crate::Result<Self> {
@@ -263,15 +231,6 @@ impl ToEString for String {
     }
 }
 
-impl Aggregatable for String {
-    type Item = Self;
-
-    #[inline]
-    fn items(self) -> Vec<Self::Item> {
-        vec![self]
-    }
-}
-
 impl ParseFragment for &'static str {
     #[inline]
     fn parse_frag(es: EString) -> crate::Result<Self> {
@@ -286,15 +245,6 @@ impl<'a> ToEString for &'a str {
     }
 }
 
-impl<'a> Aggregatable for &'a str {
-    type Item = Self;
-
-    #[inline]
-    fn items(self) -> Vec<Self::Item> {
-        vec![self]
-    }
-}
-
 #[cfg(test)]
 mod tests {
     use super::*;

src/std/bool.rs

@@ -1,4 +1,4 @@
-use crate::core::{Aggregatable, EString, ParseFragment, ToEString};
+use crate::core::{EString, ParseFragment, ToEString};
 use crate::error::{Error, Reason};
 
 impl ParseFragment for bool {
@@ -19,15 +19,6 @@ impl ToEString for bool {
     }
 }
 
-impl Aggregatable for bool {
-    type Item = Self;
-
-    #[inline]
-    fn items(self) -> Vec<Self::Item> {
-        vec![self]
-    }
-}
-
 #[cfg(test)]
 mod tests {
     use super::*;

src/std/number.rs

@@ -1,4 +1,4 @@
-use crate::core::{Aggregatable, EString, ParseFragment, ToEString};
+use crate::core::{EString, ParseFragment, ToEString};
 use crate::error::{Error, Reason};
 
 #[doc(hidden)]
@@ -18,15 +18,6 @@ macro_rules! from_env_string_numbers_impl {
                     EString(self.to_string())
                 }
             }
-
-            impl Aggregatable for $ty {
-                type Item = Self;
-
-                #[inline]
-                fn items(self) -> Vec<Self::Item> {
-                    vec![self]
-                }
-            }
         )+
     };
 }

src/std/option.rs

@@ -1,4 +1,4 @@
-use crate::core::{Aggregatable, EString, ParseFragment, ToEString};
+use crate::core::{EString, ParseFragment, ToEString};
 
 impl<T> ToEString for Option<T>
 where
@@ -25,17 +25,6 @@ where
     }
 }
 
-impl<T> Aggregatable for Option<T>
-where
-    T: Aggregatable,
-{
-    type Item = T::Item;
-
-    fn items(self) -> Vec<Self::Item> {
-        self.map(T::items).unwrap_or_default()
-    }
-}
-
 #[cfg(test)]
 mod tests {
     use super::*;

src/structs/sep_vec.rs

@@ -1,7 +1,7 @@
 //! Contains the implementations to vec type
 //!
 
-use crate::core::{Aggregatable, EString, ParseFragment, ToEString};
+use crate::core::{EString, ParseFragment, ToEString};
 use std::fmt::Write;
 
 /// Wrapper for ``Vec`` to split string by a separator (`SEP`).
@@ -92,25 +92,17 @@ where
     }
 }
 
-impl<T, const SEP: char> Aggregatable for SepVec<T, SEP>
-where
-    T: Aggregatable,
-{
-    type Item = T::Item;
-
-    fn items(self) -> Vec<Self::Item> {
-        self.0.into_iter().flat_map(T::items).collect()
-    }
-}
-
 #[cfg(test)]
 mod tests {
     use super::*;
     use crate::Pair;
     use crate::{Error, Reason};
 
-    type CommaVec<T> = SepVec<T, ','>;
+    const COMMA: char = ',';
-    type SemiVec<T> = SepVec<T, ';'>;
+    const SEMI: char = ';';
+
+    type CommaVec<T> = SepVec<T, COMMA>;
+    type SemiVec<T> = SepVec<T, SEMI>;
 
     #[test]
     fn should_parse_into_vec() {
@@ -179,18 +171,4 @@ d,e";
         let vec = SepVec::<_, ','>::from(vec![PlusPair::from((1, 2)), PlusPair::from((3, 4))]);
         assert_eq!(vec.to_estring(), EString(String::from("1+2,3+4")));
     }
-
-    #[test]
-    fn should_returns_aggregatable_items() {
-        let estr = EString::from("1,2,3,4,5");
-        let res = estr.parse::<CommaVec<i32>>().unwrap();
-        assert_eq!(res.items(), vec![1, 2, 3, 4, 5]);
-    }
-
-    #[test]
-    fn should_returns_flatten_aggregatable_items() {
-        let estr = EString::from("1,2; 3,4,5; 6,7");
-        let res = estr.parse::<SemiVec<CommaVec<i32>>>().unwrap();
-        assert_eq!(res.items(), vec![1, 2, 3, 4, 5, 6, 7]);
-    }
 }