new aggr implementations

main
Ziyang Hu 2 years ago
parent 0978415b19
commit e857a54a02

@ -80,9 +80,9 @@ impl From<DataValue> for JsonValue {
DataValue::Regex(r) => { DataValue::Regex(r) => {
json!(r.0.as_str()) json!(r.0.as_str())
} }
DataValue::Map(m) => { // DataValue::Map(m) => {
JsonValue::Array(m.into_iter().map(|(k, v)| json!([k, v])).collect()) // JsonValue::Array(m.into_iter().map(|(k, v)| json!([k, v])).collect())
} // }
} }
} }
} }

@ -1,5 +1,5 @@
use std::cmp::{Ordering, Reverse}; use std::cmp::{Ordering, Reverse};
use std::collections::{BTreeMap, BTreeSet}; use std::collections::BTreeSet;
use std::fmt::{Debug, Display, Formatter}; use std::fmt::{Debug, Display, Formatter};
use anyhow::{bail, Result}; use anyhow::{bail, Result};
@ -79,8 +79,6 @@ pub(crate) enum DataValue {
List(Vec<DataValue>), List(Vec<DataValue>),
#[serde(rename = "y")] #[serde(rename = "y")]
Set(BTreeSet<DataValue>), Set(BTreeSet<DataValue>),
#[serde(rename = "w")]
Map(BTreeMap<DataValue, DataValue>),
#[serde(rename = "g")] #[serde(rename = "g")]
Guard, Guard,
#[serde(rename = "o")] #[serde(rename = "o")]
@ -210,7 +208,6 @@ impl Debug for DataValue {
} }
DataValue::List(t) => f.debug_list().entries(t.iter()).finish(), DataValue::List(t) => f.debug_list().entries(t.iter()).finish(),
DataValue::Set(t) => f.debug_list().entries(t.iter()).finish(), DataValue::Set(t) => f.debug_list().entries(t.iter()).finish(),
DataValue::Map(m) => f.debug_map().entries(m.iter()).finish(),
DataValue::DescVal(v) => { DataValue::DescVal(v) => {
write!(f, "desc<{:?}>", v) write!(f, "desc<{:?}>", v)
} }

Loading…
Cancel
Save