starred/zen
1
0
Fork 0
mirror of https://github.com/gorules/zen.git synced 2026-10-04 08:02:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: double borrow (#252)

Browse Source
This commit is contained in:
stefan-gorules
2024-10-04 22:53:49 +02:00
committed by GitHub
parent 94fdf28ed0
commit ec6004a6d4
2 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/engine/src/handler/traversal.rs
+3 -3
View File
@@ -76,9 +76,9 @@ impl GraphWalker {
let node_values = self
.node_data
.iter()
.map(|(idx, value)| {
let weight = g.node_weight(*idx).unwrap();
(weight.name.clone(), value.clone())
.filter_map(|(idx, value)| {
let weight = g.node_weight(*idx)?;
Some((weight.name.clone(), value.clone()))
})
.collect();
core/expression/src/variable/mod.rs
+10 -4
View File
@@ -235,9 +235,12 @@ fn merge_variables(doc: &mut Variable, patch: &Variable, top_level: bool) {
if doc.is_object() && patch.is_object() {
let map_ref = doc.as_object().unwrap();
let mut map = map_ref.borrow_mut();
let patch_ref = patch.as_object().unwrap();
if Rc::ptr_eq(&map_ref, &patch_ref) {
return;
}
let mut map = map_ref.borrow_mut();
let patch = patch_ref.borrow();
for (key, value) in patch.deref() {
if value == &Variable::Null {
@@ -249,9 +252,12 @@ fn merge_variables(doc: &mut Variable, patch: &Variable, top_level: bool) {
}
} else if doc.is_array() && patch.is_array() {
let arr_ref = doc.as_array().unwrap();
let mut arr = arr_ref.borrow_mut();
let patch_ref = patch.as_array().unwrap();
if Rc::ptr_eq(&arr_ref, &patch_ref) {
return;
}
let mut arr = arr_ref.borrow_mut();
let patch = patch_ref.borrow();
arr.extend(patch.iter().map(|s| s.shallow_clone()));
} else {