add bootstrap and cleanup

Author: ErikMcClure

Cargo.lock

@@ -12,6 +12,7 @@ members = [
     # testing and examples
     "async-byte-channel",
     "benchmark",
+    "bootstrap",
     "capnpc/test",
     "capnpc/test/external-crate",
     "capnpc/test-edition-2018",

Cargo.toml

@@ -0,0 +1,15 @@
+[package]
+
+name = "bootstrap"
+version = "0.0.0"
+authors = ["Erik McClure"]
+edition.workspace = true
+license.workspace = true
+
+[[bin]]
+name = "bootstrap"
+path = "main.rs"
+
+[dependencies]
+capstone-gen.workspace = true
+capnp-sys.workspace = true

bootstrap/Cargo.toml

@@ -0,0 +1,37 @@
+pub fn main() {
+    let root = std::path::Path::new(std::env!("CARGO_MANIFEST_DIR"))
+        .parent()
+        .unwrap();
+
+    std::env::set_current_dir(root).unwrap();
+    let output = capnp_sys::call(
+        ["capnp/schema.capnp"].iter(),
+        [root.to_str().unwrap()].iter(),
+        ["capnp/".to_string()].iter(),
+        false,
+    )
+    .expect("Failed to run capnp command");
+
+    ::capnpc::codegen::CodeGenerationCommand::new()
+        .output_directory(root.join("capnp/src"))
+        .capnp_root("crate")
+        .run(output.as_slice())
+        .expect("failed to bootstrap schema");
+
+    let output = capnp_sys::call(
+        [
+            "capnp-rpc/schema/rpc.capnp",
+            "capnp-rpc/schema/rpc-twoparty.capnp",
+        ]
+        .iter(),
+        [root.to_str().unwrap()].iter(),
+        ["capnp-rpc/schema/".to_string()].iter(),
+        false,
+    )
+    .expect("Failed to run capnp command");
+
+    ::capnpc::codegen::CodeGenerationCommand::new()
+        .output_directory(root.join("capnp-rpc/src"))
+        .run(output.as_slice())
+        .expect("failed to bootstrap RPC schema");
+}

bootstrap/main.rs

@@ -1995,8 +1995,7 @@ where
     fn resolve(state: &Rc<RefCell<Self>>, response: Result<Response<VatId>, Error>) {
         let to_resolve = {
             let tmp = state.borrow();
-            let r = tmp.promise_clients_to_resolve.borrow_mut().drain();
-            r
+            tmp.promise_clients_to_resolve.borrow_mut().drain()
         };
         for ((c, ops), _) in to_resolve {
             let resolved = match response.clone() {