Preserve map order when merging

David Orchard · David Orchard · commit 713459227019 · 2021-08-15T10:31:38.000-07:00
diff --git a/src/path/mod.rs b/src/path/mod.rs
@@ -209,7 +209,11 @@ impl Expression {
                     _ => {
                         if let ValueKind::Table(ref mut map) = root.kind {
                             // Just do a simple set
-                            map.insert(id.clone(), value);
+                            if let Some(existing) = map.get_mut(id) {
+                                *existing = value;
+                            } else {
+                                map.insert(id.clone(), value);
+                            }
                         }
                     }
                 }

Original file line number	Diff line number	Diff line change
`@@ -209,7 +209,11 @@ impl Expression {`
`209`	`209`	`_ => {`
`210`	`210`	`if let ValueKind::Table(ref mut map) = root.kind {`
`211`	`211`	`// Just do a simple set`
`212`		`- map.insert(id.clone(), value);`
	`212`	`+ if let Some(existing) = map.get_mut(id) {`
	`213`	`+ *existing = value;`
	`214`	`+ } else {`
	`215`	`+ map.insert(id.clone(), value);`
	`216`	`+ }`
`213`	`217`	`}`
`214`	`218`	`}`
`215`	`219`	`}`