fluencelabs/jsonpath
1
0
Fork 0
mirror of https://github.com/fluencelabs/jsonpath synced 2025-04-25 09:22:19 +00:00
Code Issues Projects Releases Wiki Activity

pass value not reference to fun

Browse Source
This commit is contained in:
Guy Korland 2019-08-11 18:07:15 +03:00 committed by freestrings
parent 2daef2c938
commit 4b62fcd376
1 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/select/mod.rs
View File

@ -5,7 +5,6 @@ use array_tool::vec::{Intersect, Union};
use serde_json::{Number, Value}; use serde_json::{Number, Value};
use parser::*; use parser::*;
use serde_json::map::Entry;
fn to_f64(n: &Number) -> f64 { fn to_f64(n: &Number) -> f64 {
if n.is_i64() { if n.is_i64() {
@ -1027,23 +1026,21 @@ pub struct SelectorMut {
value: Option<Value>, value: Option<Value>,
} }
fn replace_value<F: FnMut(Value) -> Value>(mut tokens: Vec<String>, value: &mut Value, fun: &mut F) { fn replace_value<F: FnMut(Value) -> Value>(tokens: Vec<String>, value: &mut Value, fun: &mut F) {
let mut target = value; let mut target = value;
let last_index = tokens.len() - 1; for (i, token) in tokens.iter().enumerate() {
for (i, token) in tokens.drain(..).enumerate() {
let target_once = target; let target_once = target;
let is_last = i == last_index; let is_last = i == tokens.len() - 1;
let target_opt = match *target_once { let target_opt = match *target_once {
Value::Object(ref mut map) => { Value::Object(ref mut map) => {
if is_last { if is_last {
if let Entry::Occupied(mut e) = map.entry(token) { if let Some(v) = map.remove(token) {
let v = e.insert(Value::Null); map.insert(token.clone(), fun(v));
e.insert(fun(v));
} }
return; return;
} }
map.get_mut(&token) map.get_mut(token)
} }
Value::Array(ref mut vec) => { Value::Array(ref mut vec) => {
if let Ok(x) = token.parse::<usize>() { if let Ok(x) = token.parse::<usize>() {