apitest: Introduce and use JsV extension extend

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

diff --git a/apitest/apitest.rs b/apitest/apitest.rs
index d2a8235892e0620649639514b0847b1720a468ad..9819759fa85a41298cf93990d68c565038504196 100644 (file)
--- a/apitest/apitest.rs
+++ b/apitest/apitest.rs
@@ -133,6 +133,15 @@ impl JsV {
   fn set<K: Into<String>>(&mut self, k: K, v: &JsV) {
     self.as_object_mut().unwrap().insert(k.into(), v.clone());
   }
+
+  fn extend<I,K,V>(&mut self, i: I)
+  where I: IntoIterator<Item=(K, V)>,
+        K: Into<String>,
+        V: Borrow<JsV>,
+  {
+    let i = i.into_iter().map(|(k,v)| (k.into(), v.borrow().clone()));
+    self.as_object_mut().unwrap().extend(i);
+  }
 }
 
 // -------------------- Substition --------------------

diff --git a/apitest/atmain.rs b/apitest/atmain.rs
index f72c4a2a1468e188e6c12e35b4d2e42521524377..557fc5cac09ca3d099ef2ec3543a3bba94be797a 100644 (file)
--- a/apitest/atmain.rs
+++ b/apitest/atmain.rs
@@ -441,9 +441,7 @@ pub fn update_update_pieces<PI:Idx>(
       "Modify" | "ModifyQuiet" => {
         let d = d.as_object().unwrap();
         p.pos = coord(&d["pos"]);
-        for (k,v) in d {
-          p.info.set(k, &v);
-        }
+        p.info.extend(d);
       },
       _ => {
         panic!("unknown op {:?} {:?}", &op, &d);