feedback

Author: jstarks

support/inspect/src/defer.rs

@@ -33,6 +33,7 @@ use mesh::MeshPayload;
 /// fn inspect_remote(sender: &mesh::Sender<MyRpc>, req: inspect::Request<'_>) {
 ///     req.respond().merge(inspect::send(sender, MyRpc::Inspect));
 /// }
+/// ```
 pub fn send<'a, S: 'a + mesh::rpc::RpcSend + Copy, F: 'a + Fn(Deferred) -> S::Message>(
     sender: S,
     map: F,

support/mesh/mesh_process/src/lib.rs

@@ -244,7 +244,7 @@ async fn node_from_environment() -> anyhow::Result<Option<NodeResult>> {
 /// ```
 #[derive(Inspect)]
 pub struct Mesh {
-    #[inspect(skip)]
+    #[inspect(rename = "name")]
     mesh_name: String,
     #[inspect(flatten, send = "MeshRequest::Inspect")]
     request: mesh::Sender<MeshRequest>,

vm/devices/storage/disk_nvme/nvme_driver/src/queue_pair.rs

@@ -51,7 +51,7 @@ pub(crate) struct QueuePair {
     task: Task<QueueHandler>,
     #[inspect(skip)]
     cancel: Cancel,
-    #[inspect(with = "|x| inspect::send(&x.send, Req::Inspect)")]
+    #[inspect(flatten, with = "|x| inspect::send(&x.send, Req::Inspect)")]
     issuer: Arc<Issuer>,
     #[inspect(skip)]
     mem: MemoryBlock,

vm/devices/vmbus/vmbus_client/src/lib.rs

@@ -109,7 +109,7 @@ pub trait PollPostMessage: Send {
 
 #[derive(Inspect)]
 pub struct VmbusClient {
-    #[inspect(flatten, with = "|x| inspect::send(x, TaskRequest::Inspect)")]
+    #[inspect(flatten, send = "TaskRequest::Inspect")]
     task_send: mesh::Sender<TaskRequest>,
     #[inspect(skip)]
     access: VmbusClientAccess,

vm/vmcore/src/vmtime.rs

@@ -580,13 +580,14 @@ impl VmTimeSourceBuilder {
 ///
 /// There is one of these per VM time clock (i.e. one per VM).
 #[derive(Inspect)]
-#[inspect(extra = "Self::inspect_extra")]
 struct PrimaryKeeper {
     #[inspect(skip)]
     req_recv: mesh::Receiver<KeeperRequest>,
     #[inspect(skip)]
     new_recv: mesh::Receiver<NewKeeperRequest>,
-    #[inspect(skip)]
+    #[inspect(
+        with = "|x| inspect::iter_by_key(x.iter().map(|(id, sender)| (id, inspect::send(sender, KeeperRequest::Inspect))))"
+    )]
     keepers: Vec<(u64, mesh::Sender<KeeperRequest>)>,
     #[inspect(skip)]
     next_id: u64,
@@ -607,15 +608,6 @@ enum NewKeeperRequest {
 }
 
 impl PrimaryKeeper {
-    fn inspect_extra(&self, resp: &mut inspect::Response<'_>) {
-        resp.fields(
-            "keepers",
-            self.keepers
-                .iter()
-                .map(|&(id, ref s)| (id, inspect::send(s, KeeperRequest::Inspect))),
-        );
-    }
-
     async fn run(&mut self) {
         enum Event {
             New(NewKeeperRequest),