From e4f7da7ec1527aa33825a753a24b00fee279e1d8 Mon Sep 17 00:00:00 2001
From: David Renshaw <dwrenshaw@gmail.com>
Date: Wed, 25 Sep 2024 11:01:42 -0400
Subject: [PATCH] remove pointless ClientVariant::NoIntercept variant

---
 capnp-rpc/src/rpc.rs | 24 ------------------------
 1 file changed, 24 deletions(-)

diff --git a/capnp-rpc/src/rpc.rs b/capnp-rpc/src/rpc.rs
index c1a9c4ab5..0ec41c8ca 100644
--- a/capnp-rpc/src/rpc.rs
+++ b/capnp-rpc/src/rpc.rs
@@ -2657,7 +2657,6 @@ where
     Import(Rc<RefCell<ImportClient<VatId>>>),
     Pipeline(Rc<RefCell<PipelineClient<VatId>>>),
     Promise(Rc<RefCell<PromiseClient<VatId>>>),
-    __NoIntercept(()),
 }
 
 struct Client<VatId>
@@ -2676,7 +2675,6 @@ where
     Import(Weak<RefCell<ImportClient<VatId>>>),
     Pipeline(Weak<RefCell<PipelineClient<VatId>>>),
     Promise(Weak<RefCell<PromiseClient<VatId>>>),
-    __NoIntercept(()),
 }
 
 struct WeakClient<VatId>
@@ -2697,7 +2695,6 @@ where
             WeakClientVariant::Import(ic) => ClientVariant::Import(ic.upgrade()?),
             WeakClientVariant::Pipeline(pc) => ClientVariant::Pipeline(pc.upgrade()?),
             WeakClientVariant::Promise(pc) => ClientVariant::Promise(pc.upgrade()?),
-            WeakClientVariant::__NoIntercept(()) => ClientVariant::__NoIntercept(()),
         };
         let connection_state = self.connection_state.upgrade()?;
         let flow_controller = self.flow_controller.upgrade()?;
@@ -2997,9 +2994,6 @@ impl<VatId> Client<VatId> {
             ClientVariant::Promise(promise_client) => {
                 WeakClientVariant::Promise(Rc::downgrade(promise_client))
             }
-            _ => {
-                unimplemented!()
-            }
         };
         WeakClient {
             connection_state: Rc::downgrade(&self.connection_state),
@@ -3047,9 +3041,6 @@ impl<VatId> Client<VatId> {
                 self.connection_state
                     .write_target(&*promise_client.borrow().cap, target)
             }
-            _ => {
-                unimplemented!()
-            }
         }
     }
 
@@ -3088,9 +3079,6 @@ impl<VatId> Client<VatId> {
                 )
                 .unwrap()
             }
-            _ => {
-                unimplemented!()
-            }
         }
     }
 }
@@ -3105,9 +3093,6 @@ impl<VatId> Clone for Client<VatId> {
             ClientVariant::Promise(promise_client) => {
                 ClientVariant::Promise(promise_client.clone())
             }
-            _ => {
-                unimplemented!()
-            }
         };
         Self {
             connection_state: self.connection_state.clone(),
@@ -3190,9 +3175,6 @@ impl<VatId> ClientHook for Client<VatId> {
             ClientVariant::Promise(promise_client) => {
                 (&*promise_client.borrow()) as *const _ as usize
             }
-            _ => {
-                unimplemented!()
-            }
         }
     }
 
@@ -3211,9 +3193,6 @@ impl<VatId> ClientHook for Client<VatId> {
                     None
                 }
             }
-            _ => {
-                unimplemented!()
-            }
         }
     }
 
@@ -3224,9 +3203,6 @@ impl<VatId> ClientHook for Client<VatId> {
             ClientVariant::Promise(promise_client) => {
                 Some(promise_client.borrow_mut().resolution_waiters.push(()))
             }
-            _ => {
-                unimplemented!()
-            }
         }
     }