apitest: Introduce and use JsV extension set

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

diff --git a/apitest/apitest.rs b/apitest/apitest.rs
index d2e051b91977e530cbfae5104470800d40aeb9f8..d2a8235892e0620649639514b0847b1720a468ad 100644 (file)
--- a/apitest/apitest.rs
+++ b/apitest/apitest.rs
@@ -128,6 +128,13 @@ impl<E:Error> From<Explode> for E {
   fn from(e: Explode) -> E { match e { } }
 }*/
 
+#[ext(pub)]
+impl JsV {
+  fn set<K: Into<String>>(&mut self, k: K, v: &JsV) {
+    self.as_object_mut().unwrap().insert(k.into(), v.clone());
+  }
+}
+
 // -------------------- Substition --------------------
 
 pub trait Substitutor {

diff --git a/apitest/atmain.rs b/apitest/atmain.rs
index 35cbd52e525f9b2d7a23b0a8244ebd4ff6d595f5..ea5b155d95ff7ce14ace963d76a34133da48770a 100644 (file)
--- a/apitest/atmain.rs
+++ b/apitest/atmain.rs
@@ -430,9 +430,7 @@ pub fn update_update_pieces<PI:Idx>(
         let d = d.as_object().unwrap();
         p.pos = coord(&d["pos"]);
         for (k,v) in d {
-          p.info
-            .as_object_mut().unwrap()
-            .insert(k.to_string(), v.clone());
+          p.info.set(k, &v);
         }
       },
       _ => {