imp(upgrade): use serde 0.9.8 and Map::Entry

Byron · Feb 22, 2017 · 6092375 · 6092375
1 parent 727ed22
commit 6092375
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 12 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -7,11 +7,11 @@ categories = ["algorithms"]
 license = "MIT/Apache-2.0"
 name = "treediff"
 repository = "https://github.com/Byron/treediff-rs"
-version = "2.5.0"
+version = "2.5.1"
 
 [dependencies]
 rustc-serialize = {version = "0.3.22", optional = true}
-serde_json = {version = "0.9", optional = true}
+serde_json = {version = "0.9.8", optional = true}
 serde_yaml = {version = "0.6", optional = true}
 yaml-rust = {version = "0.3", optional = true}
 

diff --git a/src/value/serde_json.rs b/src/value/serde_json.rs
@@ -1,6 +1,6 @@
 use traitdef::{Mutable, Value};
 use super::Key;
-use serde_json::{Map, Value as SerdeJson};
+use serde_json::{Map, Value as SerdeJson, map};
 use std::mem;
 
 impl Value for SerdeJson {
@@ -65,16 +65,16 @@ impl Mutable for SerdeJson {
                             c
                         } {
                             &mut SerdeJson::Object(ref mut obj) => {
-                                if obj.contains_key(k) {
-                                    let obj = obj.get_mut(k).expect("map to work");
-                                    if i == last_key_index {
-                                        *obj = v.clone();
-                                        return;
+                                match obj.entry(k.clone()) {
+                                    map::Entry::Vacant(e) => e.insert(object_or_value(i)),
+                                    map::Entry::Occupied(e) => {
+                                        if i == last_key_index {
+                                            *e.into_mut() = v.clone();
+                                            return;
+                                        } else {
+                                            e.into_mut()
+                                        }
                                     }
-                                    obj
-                                } else {
-                                    obj.insert(k.clone(), object_or_value(i));
-                                    obj.get_mut(k).expect("map to work")
                                 }
                             }
                             c @ &mut SerdeJson::String(_) |