remove deprecated things associated with ServerHook

Author: dwrensha

capnp-rpc/src/lib.rs

@@ -69,7 +69,7 @@ use futures::{Future, FutureExt, TryFutureExt};
 use futures::channel::oneshot;
 use capnp::Error;
 use capnp::capability::Promise;
-use capnp::private::capability::{ClientHook, ServerHook};
+use capnp::private::capability::{ClientHook};
 use std::cell::{RefCell};
 use std::rc::{Rc};
 
@@ -298,25 +298,6 @@ impl <VatId> Future for RpcSystem<VatId> where VatId: 'static {
     }
 }
 
-/// Hook that allows local implementations of interfaces to be passed to the RPC system
-/// so that they can be called remotely.
-///
-/// To use this, you need to do the following dance:
-///
-/// ```ignore
-/// let client = foo::ToClient::new(FooImpl).into_client::<::capnp_rpc::Server>());
-/// ```
-#[deprecated(since="capnp-rpc-v0.12.2",
-             note="Use capnp_rpc::new_client() instead. You may need to do `cargo update -p capnpc` too.")]
-pub struct Server;
-
-#[allow(deprecated)]
-impl ServerHook for Server {
-    fn new_client(server: Box<dyn (::capnp::capability::Server)>) -> ::capnp::capability::Client {
-        ::capnp::capability::Client::new(Box::new(local::Client::new(server)))
-    }
-}
-
 /// Creates a new local RPC client of type `C` out of an object that implements a server trait `S`.
 pub fn new_client<C, S>(s: S) -> C where C: capnp::capability::FromServer<S> {
     capnp::capability::FromClientHook::new(Box::new(

capnp/src/private/capability.rs

@@ -73,11 +73,6 @@ impl Clone for Box<dyn ClientHook> {
     }
 }
 
-// TODO(versionbump) remove this. It has been superseded by capnp::capability::FromServer.
-pub trait ServerHook: 'static {
-    fn new_client(server: Box<dyn crate::capability::Server>) -> crate::capability::Client;
-}
-
 pub trait ResultsHook {
     fn get<'a>(&'a mut self) -> crate::Result<any_pointer::Builder<'a>>;
     fn allow_cancellation(&self);

capnpc/src/codegen.rs

@@ -1717,38 +1717,6 @@ fn generate_node(gen: &GeneratorContext,
                             Line("}".to_string())]))),
                 Line("}".to_string())]));
 
-            // TODO(versionbump): Remove this, as it has been superseded by capnp_rpc::new_client().
-            mod_interior.push(
-                Branch(vec!(
-                    (if is_generic {
-                        Branch(vec!(
-                            Line(format!("pub struct ToClient<_U,{}> {} {{", params.params, params.where_clause)),
-                            Indent(Box::new(Branch(vec!(
-                                Line("pub u: _U,".to_string()),
-                                Line(params.phantom_data_type.clone()),
-                            )))),
-                            Line("}".to_string()),
-                            Line(format!("impl <{0}, _U: Server<{0}> + 'static> ToClient<_U,{0}> {1} {{",
-                                         params.params, params.where_clause_with_static)),
-                            Indent(Box::new(Line(format!(
-                                "pub fn new(u: _U) -> ToClient<_U, {}> {{ ToClient {{u, _phantom: ::std::marker::PhantomData}} }}",
-                                params.params)))),
-                        ))
-                    } else {
-                        Branch(vec!(
-                            Line("pub struct ToClient<_U>{pub u: _U}".to_string()),
-                            Line("impl <_U: Server + 'static> ToClient<_U> {".to_string()),
-                            Indent(Box::new(Line("pub fn new(u: _U) -> ToClient<_U> { ToClient {u} }".to_string()))),
-                        ))
-                    }),
-                    Indent(Box::new(Branch( vec!(
-                        Line(format!("pub fn into_client<_T: ::capnp::private::capability::ServerHook>(self) -> Client{} {{", bracketed_params)),
-                        Indent(
-                            Box::new(Line(format!("Client {{ client: _T::new_client(::std::boxed::Box::new(ServerDispatch {{ server: ::std::boxed::Box::new(self.u), {} }})), {} }}", params.phantom_data_value, params.phantom_data_value)))),
-                        Line("}".to_string()))))),
-                    Line("}".to_string()))));
-
-
             mod_interior.push(
                 Branch(vec!(
                     Line(format!("impl {0} ::capnp::traits::HasTypeId for Client{0} {{",