tarpc updated

mit-pdos · Mar 8, 2017 · b7abc6e · b7abc6e
1 parent 3db732f
commit b7abc6e
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/benchmarks/vote/targets/netsoup.rs b/benchmarks/vote/targets/netsoup.rs
@@ -2,7 +2,7 @@ use distributary::srv;
 use distributary::{Blender, Base, Aggregation, JoinBuilder, DataType};
 use tarpc;
 use tarpc::util::FirstSocketAddr;
-use tarpc::client::future::ClientExt;
+use tarpc::future::client::{Options, ClientExt};
 use tokio_core::reactor;
 
 use targets::Backend;
@@ -90,7 +90,6 @@ impl SoupTarget {
         use self::srv::ext::FutureClient;
         let mut core = reactor::Core::new().unwrap();
         for _ in 0..3 {
-            use tarpc::client::Options;
             let c = FutureClient::connect(self.addr, Options::default().handle(core.handle()));
             match core.run(c) {
                 Ok(client) => {

diff --git a/src/srv/mod.rs b/src/srv/mod.rs
@@ -136,9 +136,10 @@ pub fn run<T: Into<::std::net::SocketAddr>>(soup: flow::Blender,
                 .name(format!("rpc{}", i))
                 .spawn(move || {
                     let mut core = reactor::Core::new().unwrap();
-                    let (_, handle) =
-                        s.listen(addr, &core.handle(), tarpc::server::Options::default())
-                            .unwrap();
+                    let (_, handle) = s.listen(addr,
+                                &core.handle(),
+                                tarpc::future::server::Options::default())
+                        .unwrap();
                     core.handle().spawn(handle);
 
                     match core.run(rx) {