git.delta.rocks / jrsonnet / refs/commits / f48f507511e2

--- a/crates/nixlike/Cargo.toml
+++ b/crates/nixlike/Cargo.toml
@@ -8,6 +8,7 @@
 [dependencies]
 anyhow = "1.0.44"
 dprint-core = "0.46.2"
+linked-hash-map = "0.5.4"
 peg = "0.7.0"
 serde = "1.0.130"
 serde_json = "1.0.68"

1use std::{1use std::convert::{TryFrom, TryInto};
2	collections::BTreeMap,2
3	convert::{TryFrom, TryInto},3use linked_hash_map::LinkedHashMap;
4};
5
6use serde::{4use serde::{
7	de::{self, MapAccess, SeqAccess},5	de::{self, MapAccess, SeqAccess},
11use crate::{Error, Value};9use crate::{Error, Value};
1210
13struct ObjectAccess {11struct ObjectAccess {
14	iter: std::collections::btree_map::IntoIter<String, Value>,12	iter: linked_hash_map::IntoIter<String, Value>,
15	value: Option<Value>,13	value: Option<Value>,
16}14}
17impl ObjectAccess {15impl ObjectAccess {
18	fn new(v: BTreeMap<String, Value>) -> Self {16	fn new(v: LinkedHashMap<String, Value>) -> Self {
19		Self {17		Self {
20			iter: v.into_iter(),18			iter: v.into_iter(),
21			value: None,19			value: None,
103			_ => Err(Error::Expected("array")),101			_ => Err(Error::Expected("array")),
104		}102		}
105	}103	}
106	fn parse_object(self) -> Result<BTreeMap<String, Value>, Error> {104	fn parse_object(self) -> Result<LinkedHashMap<String, Value>, Error> {
107		match self {105		match self {
108			Value::Object(s) => Ok(s),106			Value::Object(s) => Ok(s),
109			_ => Err(Error::Expected("object")),107			_ => Err(Error::Expected("object")),

--- a/crates/nixlike/src/lib.rs
+++ b/crates/nixlike/src/lib.rs
@@ -1,5 +1,4 @@
-use std::collections::BTreeMap;
-
+use linked_hash_map::LinkedHashMap;
 use peg::str::LineCol;
 use se_impl::MySerialize;
 use serde::{Deserialize, Serialize};
@@ -29,7 +28,7 @@
 	Number(i64),
 	String(String),
 	Boolean(bool),
-	Object(BTreeMap<String, Value>),
+	Object(LinkedHashMap<String, Value>),
 	Array(Vec<Value>),
 	Null,
 }
@@ -49,11 +48,11 @@
 		/ "false" {false} } / expected!("<boolean>")
 	rule indent() -> String
 		= quiet! { s:$(['a'..='z' | 'A'..='Z' | '0'..='9' | '_' | '-']+) { s.to_owned() } } / expected!("<identifier>")
-	rule object() -> BTreeMap<String, Value>
+	rule object() -> LinkedHashMap<String, Value>
 		= "{" _
 			e:(k:indent()++(_ "." _) _ "=" _ v:value() _ ";" _ {(k, v)})*
 		"}" {?
-			let mut out = BTreeMap::new();
+			let mut out = LinkedHashMap::new();
 			for (k, v) in e {
 				let mut map = &mut out;
 				for v in k.iter().take(k.len() - 1) {

--- a/crates/nixlike/src/se_impl.rs
+++ b/crates/nixlike/src/se_impl.rs
@@ -1,5 +1,6 @@
-use std::{collections::BTreeMap, convert::TryInto};
+use std::convert::TryInto;
 
+use linked_hash_map::LinkedHashMap;
 use serde::{
 	ser::{
 		self, SerializeMap, SerializeSeq, SerializeStruct, SerializeStructVariant, SerializeTuple,
@@ -96,7 +97,7 @@
 	}
 }
 
-pub struct MySerializeMap(BTreeMap<String, Value>, Option<String>);
+pub struct MySerializeMap(LinkedHashMap<String, Value>, Option<String>);
 
 impl SerializeMap for MySerializeMap {
 	type Ok = Value;
@@ -127,7 +128,7 @@
 	}
 }
 
-pub struct MySerializeStruct(BTreeMap<String, Value>);
+pub struct MySerializeStruct(LinkedHashMap<String, Value>);
 
 impl SerializeStruct for MySerializeStruct {
 	type Ok = Value;
@@ -147,7 +148,7 @@
 	}
 }
 
-pub struct MySerializeStructVariant(String, BTreeMap<String, Value>);
+pub struct MySerializeStructVariant(String, LinkedHashMap<String, Value>);
 
 impl SerializeStructVariant for MySerializeStructVariant {
 	type Ok = Value;
@@ -336,7 +337,7 @@
 	}
 
 	fn serialize_map(self, _len: Option<usize>) -> Result<Self::SerializeMap, Self::Error> {
-		Ok(MySerializeMap(BTreeMap::new(), None))
+		Ok(MySerializeMap(LinkedHashMap::new(), None))
 	}
 
 	fn serialize_struct(
@@ -344,7 +345,7 @@
 		_name: &'static str,
 		_len: usize,
 	) -> Result<Self::SerializeStruct, Self::Error> {
-		Ok(MySerializeStruct(BTreeMap::new()))
+		Ok(MySerializeStruct(LinkedHashMap::new()))
 	}
 
 	fn serialize_struct_variant(
@@ -356,7 +357,7 @@
 	) -> Result<Self::SerializeStructVariant, Self::Error> {
 		Ok(MySerializeStructVariant(
 			variant.to_owned(),
-			BTreeMap::new(),
+			LinkedHashMap::new(),
 		))
 	}
 }

--- a/crates/nixlike/src/to_string.rs
+++ b/crates/nixlike/src/to_string.rs
@@ -41,7 +41,7 @@
 				out.push_signal(Signal::StartIndent);
 				out.push_condition(conditions::if_true_or(
 					"array start",
-					is_multiple_lines.clone(),
+					is_multiple_lines,
 					Signal::NewLine.into(),
 					Signal::SpaceOrNewLine.into(),
 				));
@@ -49,7 +49,7 @@
 					write_nix_buf(item, out);
 					out.push_condition(conditions::if_true_or(
 						"element separator",
-						is_multiple_lines.clone(),
+						is_multiple_lines,
 						Signal::NewLine.into(),
 						Signal::SpaceOrNewLine.into(),
 					));
@@ -73,7 +73,7 @@
 				out.push_signal(Signal::StartIndent);
 				out.push_condition(conditions::if_true_or(
 					"object start",
-					is_multiple_lines.clone(),
+					is_multiple_lines,
 					Signal::NewLine.into(),
 					Signal::SpaceOrNewLine.into(),
 				));
@@ -81,7 +81,7 @@
 					write_nix_obj_key_buf(k, v, out);
 					out.push_condition(conditions::if_true_or(
 						"element separator",
-						is_multiple_lines.clone(),
+						is_multiple_lines,
 						Signal::NewLine.into(),
 						Signal::SpaceOrNewLine.into(),
 					));