Some minor changes for partiql-value (#200)

- Fix `partiql_list` and `partiql_bag` macro_rules for repetitive values
- Minor changes to code placement in `lib.rs`

Author: am357

partiql-value/src/lib.rs

@@ -176,7 +176,57 @@ impl Ord for Value {
     }
 }
 
+impl From<String> for Value {
+    #[inline]
+    fn from(s: String) -> Self {
+        Value::String(Box::new(s))
+    }
+}
+
+impl From<&str> for Value {
+    #[inline]
+    fn from(s: &str) -> Self {
+        Value::String(Box::new(s.to_string()))
+    }
+}
+
+impl From<i64> for Value {
+    #[inline]
+    fn from(n: i64) -> Self {
+        Value::Integer(n)
+    }
+}
+
+impl From<f64> for Value {
+    #[inline]
+    fn from(f: f64) -> Self {
+        Value::Real(OrderedFloat(f))
+    }
+}
+
+impl From<List> for Value {
+    #[inline]
+    fn from(v: List) -> Self {
+        Value::List(Box::new(v))
+    }
+}
+
+impl From<Tuple> for Value {
+    #[inline]
+    fn from(v: Tuple) -> Self {
+        Value::Tuple(Box::new(v))
+    }
+}
+
+impl From<Bag> for Value {
+    #[inline]
+    fn from(v: Bag) -> Self {
+        Value::Bag(Box::new(v))
+    }
+}
+
 #[derive(Default, Hash, PartialEq, Eq, Clone)]
+/// Represents a PartiQL List value, e.g. [1, 2, 'one']
 pub struct List(Vec<Value>);
 
 impl List {
@@ -226,7 +276,7 @@ macro_rules! partiql_list {
          List::from(vec![])
     );
     ($elem:expr; $n:expr) => (
-        List::from(vec![Value::from($elem), $n])
+        List::from(vec![Value::from($elem); $n])
     );
     ($($x:expr),+ $(,)?) => (
         List::from(vec![$(Value::from($x)),+])
@@ -252,13 +302,6 @@ impl Iterator for ListIntoIterator {
     }
 }
 
-impl From<List> for Value {
-    #[inline]
-    fn from(v: List) -> Self {
-        Value::List(Box::new(v))
-    }
-}
-
 impl Debug for List {
     fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
         f.debug_list().entries(&self.0).finish()
@@ -307,6 +350,7 @@ impl Ord for List {
 }
 
 #[derive(Default, Eq, Clone)]
+/// Represents a PartiQL BAG value, e.g.: <<1, 'two', 4>>
 pub struct Bag(Vec<Value>);
 
 impl Bag {
@@ -346,7 +390,7 @@ macro_rules! partiql_bag {
          Bag::from(vec![])
     );
     ($elem:expr; $n:expr) => (
-        Bag::from(vec![Value::from($elem), $n])
+        Bag::from(vec![Value::from($elem); $n])
     );
     ($($x:expr),+ $(,)?) => (
         Bag::from(vec![$(Value::from($x)),+])
@@ -372,13 +416,6 @@ impl Iterator for BagIntoIterator {
     }
 }
 
-impl From<Bag> for Value {
-    #[inline]
-    fn from(v: Bag) -> Self {
-        Value::Bag(Box::new(v))
-    }
-}
-
 impl Debug for Bag {
     fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
         write!(f, "<<")?;
@@ -444,13 +481,6 @@ where
     }
 }
 
-impl From<Tuple> for Value {
-    #[inline]
-    fn from(v: Tuple) -> Self {
-        Value::Tuple(Box::new(v))
-    }
-}
-
 #[macro_export]
 macro_rules! partiql_tuple {
     () => (
@@ -517,34 +547,6 @@ impl Hash for Tuple {
     }
 }
 
-impl From<String> for Value {
-    #[inline]
-    fn from(s: String) -> Self {
-        Value::String(Box::new(s))
-    }
-}
-
-impl From<&str> for Value {
-    #[inline]
-    fn from(s: &str) -> Self {
-        Value::String(Box::new(s.to_string()))
-    }
-}
-
-impl From<i64> for Value {
-    #[inline]
-    fn from(n: i64) -> Self {
-        Value::Integer(n)
-    }
-}
-
-impl From<f64> for Value {
-    #[inline]
-    fn from(f: f64) -> Self {
-        Value::Real(OrderedFloat(f))
-    }
-}
-
 #[cfg(test)]
 mod tests {
     use super::*;
@@ -578,4 +580,15 @@ mod tests {
         println!("Cow<Value> size: {}", mem::size_of::<Cow<Value>>());
         println!("Cow<&Value> size: {}", mem::size_of::<Cow<&Value>>());
     }
+
+    #[test]
+    fn macro_rules_tests() {
+        println!("partiql_list:{:?}", partiql_list!());
+        println!("partiql_list:{:?}", partiql_list![10, 10]);
+        println!("partiql_list:{:?}", partiql_list!(5; 3));
+        println!("partiql_bag:{:?}", partiql_bag!());
+        println!("partiql_bag:{:?}", partiql_bag![10, 10]);
+        println!("partiql_bag:{:?}", partiql_bag!(5; 3));
+        println!("partiql_tuple:{:?}", partiql_tuple![("a", 1), ("b", 2)]);
+    }
 }