From e857a54a02dee2332fcbd75cd3c9fdc5d7ec4e56 Mon Sep 17 00:00:00 2001
From: Ziyang Hu <hu.ziyang@cantab.net>
Date: Tue, 23 Aug 2022 21:39:08 +0800
Subject: [PATCH] new aggr implementations

---
 src/data/json.rs  | 6 +++---
 src/data/value.rs | 5 +----
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/src/data/json.rs b/src/data/json.rs
index a4015e73..cec17c9a 100644
--- a/src/data/json.rs
+++ b/src/data/json.rs
@@ -80,9 +80,9 @@ impl From<DataValue> for JsonValue {
             DataValue::Regex(r) => {
                 json!(r.0.as_str())
             }
-            DataValue::Map(m) => {
-                JsonValue::Array(m.into_iter().map(|(k, v)| json!([k, v])).collect())
-            }
+            // DataValue::Map(m) => {
+            //     JsonValue::Array(m.into_iter().map(|(k, v)| json!([k, v])).collect())
+            // }
         }
     }
 }
diff --git a/src/data/value.rs b/src/data/value.rs
index 7ca916c1..b9fd7b1c 100644
--- a/src/data/value.rs
+++ b/src/data/value.rs
@@ -1,5 +1,5 @@
 use std::cmp::{Ordering, Reverse};
-use std::collections::{BTreeMap, BTreeSet};
+use std::collections::BTreeSet;
 use std::fmt::{Debug, Display, Formatter};
 
 use anyhow::{bail, Result};
@@ -79,8 +79,6 @@ pub(crate) enum DataValue {
     List(Vec<DataValue>),
     #[serde(rename = "y")]
     Set(BTreeSet<DataValue>),
-    #[serde(rename = "w")]
-    Map(BTreeMap<DataValue, DataValue>),
     #[serde(rename = "g")]
     Guard,
     #[serde(rename = "o")]
@@ -210,7 +208,6 @@ impl Debug for DataValue {
             }
             DataValue::List(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) => {
                 write!(f, "desc<{:?}>", v)
             }