feat(named-args): use std::collections::HashMap instead of indexmap…

… crate
geldata · Mar 27, 2024 · cb5ad3e · cb5ad3e
1 parent ab1db25
commit cb5ad3e
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 19 deletions.
diff --git a/edgedb-protocol/Cargo.toml b/edgedb-protocol/Cargo.toml
@@ -22,16 +22,15 @@ chrono = {version="0.4.23", optional=true, features=["std"], default-features=fa
 edgedb-errors = {path = "../edgedb-errors", version = "0.4.0" }
 bitflags = "2.4.0"
 serde = {version="1.0.190", optional=true}
-indexmap = {version = "2.2", optional=true}
 
 [features]
-default = []
+default = ["macros"]
 with-num-bigint = ["num-bigint", "num-traits"]
 with-bigdecimal = ["bigdecimal", "num-bigint", "num-traits"]
 with-chrono = ["chrono"]
 all-types = ["with-num-bigint", "with-bigdecimal", "with-chrono"]
 with-serde = ["serde"]
-macros = ["indexmap"]
+macros = []
 
 [dev-dependencies]
 rand = "0.8"

diff --git a/edgedb-protocol/src/query_arg.rs b/edgedb-protocol/src/query_arg.rs
@@ -594,27 +594,33 @@ where
 
 #[cfg(feature = "macros")]
 pub mod macros {
-    use crate::query_arg::{Value, ValueWithCardinality, object_from_pairs};
-
-    pub struct EdgedbArgsIndexMap<'i>(pub indexmap::IndexMap<&'i str, ValueWithCardinality>);
-    impl EdgedbArgsIndexMap<'_> {
-        pub fn to_value(self) -> Value {
-            Value::from(self)
-        }
-    }
+	use crate::query_arg::{object_from_pairs, Value, ValueWithCardinality};
 
-    impl From<EdgedbArgsIndexMap<'_>> for Value {
-        fn from(value: EdgedbArgsIndexMap) -> Self {
-            object_from_pairs(value.0)
-        }
-    }
+	pub struct EdgedbArgsIndexMap<'i>(pub std::collections::HashMap<&'i str, ValueWithCardinality>);
+	impl EdgedbArgsIndexMap<'_> {
+		pub fn to_value(self) -> Value {
+			Value::from(self)
+		}
+	}
+
+	impl From<EdgedbArgsIndexMap<'_>> for Value {
+		fn from(value: EdgedbArgsIndexMap) -> Self {
+			object_from_pairs(value.0)
+		}
+	}
 
     #[macro_export]
     macro_rules! eargs {
+        ($($key:expr => $value:expr,)+) => { $crate::eargs!($($key => $value),+) };
         ($($key:expr => $value:expr),*) => {
-            edgedb_protocol::query_arg::macros::EdgedbArgsIndexMap(indexmap::indexmap! {
-                $($key => edgedb_protocol::query_arg::ValueWithCardinality::from($value)),*
-            })
+            {
+                const CAP: usize = <[()]>::len(&[$({ stringify!($key); }),*]);
+                let mut map = std::collections::HashMap::with_capacity(CAP);
+                $(
+                    map.insert($key, $crate::query_arg::ValueWithCardinality::from($value));
+                )*
+                $crate::query_arg::macros::EdgedbArgsIndexMap(map)
+            }
         };
     }
 }