&self -> Rc<Self> in RPC methods

Author: dwrensha

capnp-rpc/examples/calculator/client.rs

@@ -29,7 +29,7 @@ pub struct PowerFunction;
 
 impl calculator::function::Server for PowerFunction {
     async fn call(
-        &self,
+        self: std::rc::Rc<Self>,
         params: calculator::function::CallParams,
         mut results: calculator::function::CallResults,
     ) -> Result<(), ::capnp::Error> {

capnp-rpc/examples/calculator/server.rs

@@ -45,7 +45,7 @@ impl ValueImpl {
 
 impl calculator::value::Server for ValueImpl {
     async fn read(
-        &self,
+        self: std::rc::Rc<Self>,
         _params: calculator::value::ReadParams,
         mut results: calculator::value::ReadResults,
     ) -> Result<(), Error> {
@@ -101,7 +101,7 @@ impl FunctionImpl {
 
 impl calculator::function::Server for FunctionImpl {
     async fn call(
-        &self,
+        self: std::rc::Rc<Self>,
         params: calculator::function::CallParams,
         mut results: calculator::function::CallResults,
     ) -> Result<(), Error> {
@@ -135,7 +135,7 @@ pub struct OperatorImpl {
 
 impl calculator::function::Server for OperatorImpl {
     async fn call(
-        &self,
+        self: std::rc::Rc<Self>,
         params: calculator::function::CallParams,
         mut results: calculator::function::CallResults,
     ) -> Result<(), Error> {
@@ -159,7 +159,7 @@ struct CalculatorImpl;
 
 impl calculator::Server for CalculatorImpl {
     async fn evaluate(
-        &self,
+        self: std::rc::Rc<Self>,
         params: calculator::EvaluateParams,
         mut results: calculator::EvaluateResults,
     ) -> Result<(), Error> {
@@ -171,7 +171,7 @@ impl calculator::Server for CalculatorImpl {
     }
 
     async fn def_function(
-        &self,
+        self: std::rc::Rc<Self>,
         params: calculator::DefFunctionParams,
         mut results: calculator::DefFunctionResults,
     ) -> Result<(), Error> {
@@ -185,7 +185,7 @@ impl calculator::Server for CalculatorImpl {
     }
 
     async fn get_operator(
-        &self,
+        self: std::rc::Rc<Self>,
         params: calculator::GetOperatorParams,
         mut results: calculator::GetOperatorResults,
     ) -> Result<(), Error> {

capnp-rpc/examples/hello-world/server.rs

@@ -30,7 +30,7 @@ struct HelloWorldImpl;
 
 impl hello_world::Server for HelloWorldImpl {
     async fn say_hello(
-        &self,
+        self: std::rc::Rc<Self>,
         params: hello_world::SayHelloParams,
         mut results: hello_world::SayHelloResults,
     ) -> Result<(), ::capnp::Error> {

capnp-rpc/examples/pubsub/client.rs

@@ -28,7 +28,7 @@ struct SubscriberImpl;
 
 impl subscriber::Server<::capnp::text::Owned> for SubscriberImpl {
     async fn push_message(
-        &self,
+        self: std::rc::Rc<Self>,
         params: subscriber::PushMessageParams<::capnp::text::Owned>,
         _results: subscriber::PushMessageResults<::capnp::text::Owned>,
     ) -> Result<(), ::capnp::Error> {

capnp-rpc/examples/pubsub/server.rs

@@ -85,7 +85,7 @@ impl PublisherImpl {
 
 impl publisher::Server<::capnp::text::Owned> for PublisherImpl {
     async fn subscribe(
-        &self,
+        self: Rc<Self>,
         params: publisher::SubscribeParams<::capnp::text::Owned>,
         mut results: publisher::SubscribeResults<::capnp::text::Owned>,
     ) -> Result<(), ::capnp::Error> {

capnp-rpc/examples/reconnect/server.rs

@@ -44,7 +44,7 @@ impl FooImpl {
 }
 impl foo::Server for FooImpl {
     async fn identity(
-        &self,
+        self: std::rc::Rc<Self>,
         params: foo::IdentityParams,
         mut results: foo::IdentityResults,
     ) -> Result<(), ::capnp::Error> {
@@ -53,7 +53,11 @@ impl foo::Server for FooImpl {
         Ok(())
     }
 
-    async fn crash(&self, _: foo::CrashParams, _: foo::CrashResults) -> Result<(), ::capnp::Error> {
+    async fn crash(
+        self: std::rc::Rc<Self>,
+        _: foo::CrashParams,
+        _: foo::CrashResults,
+    ) -> Result<(), ::capnp::Error> {
         if let Some(d) = self.disconnect.borrow_mut().take() {
             let _ = d.send(());
         }

capnp-rpc/examples/streaming/server.rs

@@ -29,7 +29,7 @@ impl ByteStreamImpl {
 }
 
 impl byte_stream::Server for ByteStreamImpl {
-    async fn write(&self, params: byte_stream::WriteParams) -> Result<(), Error> {
+    async fn write(self: std::rc::Rc<Self>, params: byte_stream::WriteParams) -> Result<(), Error> {
         let bytes = params.get()?.get_bytes()?;
         self.hasher.borrow_mut().update(bytes);
         self.bytes_received
@@ -38,7 +38,7 @@ impl byte_stream::Server for ByteStreamImpl {
     }
 
     async fn end(
-        &self,
+        self: std::rc::Rc<Self>,
         _params: byte_stream::EndParams,
         _results: byte_stream::EndResults,
     ) -> Result<(), Error> {
@@ -66,7 +66,7 @@ impl ReceiverImpl {
 
 impl receiver::Server for ReceiverImpl {
     async fn write_stream(
-        &self,
+        self: std::rc::Rc<Self>,
         _params: receiver::WriteStreamParams,
         mut results: receiver::WriteStreamResults,
     ) -> Result<(), Error> {

capnp-rpc/src/lib.rs

@@ -379,7 +379,7 @@ where
     C: capnp::capability::FromServer<S>,
 {
     capnp::capability::FromClientHook::new(Box::new(local::Client::new(
-        <C as capnp::capability::FromServer<S>>::from_server(s),
+        <C as capnp::capability::FromServer<S>>::from_server(Rc::new(s)),
     )))
 }
 
@@ -393,7 +393,8 @@ pub struct CapabilityServerSet<S, C>
 where
     C: capnp::capability::FromServer<S>,
 {
-    caps: std::collections::HashMap<usize, Weak<C::Dispatch>>,
+    caps: std::collections::HashMap<usize, Weak<S>>,
+    marker: std::marker::PhantomData<C>,
 }
 
 impl<S, C> Default for CapabilityServerSet<S, C>
@@ -403,6 +404,7 @@ where
     fn default() -> Self {
         Self {
             caps: std::default::Default::default(),
+            marker: std::marker::PhantomData,
         }
     }
 }
@@ -417,16 +419,18 @@ where
 
     /// Adds a new capability to the set and returns a client backed by it.
     pub fn new_client(&mut self, s: S) -> C {
-        let dispatch = <C as capnp::capability::FromServer<S>>::from_server(s);
-        let wrapped = Rc::new(dispatch);
-        let ptr = Rc::as_ptr(&wrapped) as usize;
-        self.caps.insert(ptr, Rc::downgrade(&wrapped));
-        capnp::capability::FromClientHook::new(Box::new(local::Client::from_rc(wrapped)))
+        let rc = Rc::new(s);
+        let weak = Rc::downgrade(&rc);
+        let ptr = Rc::as_ptr(&rc) as usize;
+        self.caps.insert(ptr, weak);
+
+        let dispatch = <C as capnp::capability::FromServer<S>>::from_server(rc);
+        capnp::capability::FromClientHook::new(Box::new(local::Client::new(dispatch)))
     }
 
     /// Looks up a capability and returns its underlying server object, if found.
     /// Fully resolves the capability before looking it up.
-    pub async fn get_local_server(&self, client: &C) -> Option<Rc<C::Dispatch>>
+    pub async fn get_local_server(&self, client: &C) -> Option<Rc<S>>
     where
         C: capnp::capability::FromClientHook,
     {
@@ -444,7 +448,7 @@ where
     /// to call `get_resolved_cap()` before calling this. The advantage of this method
     /// over `get_local_server()` is that this one is synchronous and borrows `self`
     /// over a shorter span (which can be very important if `self` is inside a `RefCell`).
-    pub fn get_local_server_of_resolved(&self, client: &C) -> Option<Rc<C::Dispatch>>
+    pub fn get_local_server_of_resolved(&self, client: &C) -> Option<Rc<S>>
     where
         C: capnp::capability::FromClientHook,
     {

capnp-rpc/src/local.rs

@@ -337,9 +337,9 @@ impl PipelineHook for Pipeline {
 
 pub struct Client<S>
 where
-    S: capability::Server,
+    S: capability::Server + Clone,
 {
-    inner: Rc<S>,
+    inner: S,
 
     /// If a streaming call on this capability has returned an error,
     /// this contains a copy of that error.
@@ -348,26 +348,19 @@ where
 
 impl<S> Client<S>
 where
-    S: capability::Server,
+    S: capability::Server + Clone,
 {
     pub fn new(server: S) -> Self {
         Self {
-            inner: Rc::new(server),
-            broken_error: Rc::new(RefCell::new(None)),
-        }
-    }
-
-    pub fn from_rc(inner: Rc<S>) -> Self {
-        Self {
-            inner,
+            inner: server,
             broken_error: Rc::new(RefCell::new(None)),
         }
     }
 }
 
 impl<S> Clone for Client<S>
 where
-    S: capability::Server,
+    S: capability::Server + Clone,
 {
     fn clone(&self) -> Self {
         Self {
@@ -379,7 +372,7 @@ where
 
 impl<S> ClientHook for Client<S>
 where
-    S: capability::Server + 'static,
+    S: capability::Server + Clone + 'static,
 {
     fn add_ref(&self) -> Box<dyn ClientHook> {
         Box::new(self.clone())
@@ -434,7 +427,7 @@ where
     }
 
     fn get_ptr(&self) -> usize {
-        Rc::as_ptr(&self.inner) as usize
+        self.inner.as_ptr()
     }
 
     fn get_brand(&self) -> usize {