OMGeeky/tarpc
1
0
Fork 0
mirror of https://github.com/OMGeeky/tarpc.git synced 2026-01-06 03:22:47 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #180 from tikue/update-deps

Browse Source 
Update deps and fix deprecation warnings.
This commit is contained in:
Tim
2018-03-27 11:25:18 -07:00
committed by GitHub
parent 326f0270b9 848eb00bea
commit 4b763e9f52
14 changed files with 45 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Cargo.toml
View File

@@ -1,6 +1,6 @@
[package]
name = "tarpc"
version = "0.9.0"
version = "0.10.0"
authors = ["Adam Wright <adam.austin.wright@gmail.com>", "Tim Kuehn <timothy.j.kuehn@gmail.com>"]
license = "MIT"
documentation = "https://docs.rs/tarpc"
@@ -15,13 +15,13 @@ description = "An RPC framework for Rust with a focus on ease of use."
travis-ci = { repository = "google/tarpc" }
[dependencies]
bincode = "0.9"
bincode = "1.0"
byteorder = "1.0"
bytes = "0.4"
cfg-if = "0.1.0"
futures = "0.1.11"
lazy_static = "1.0"
log = "0.3"
log = "0.4"
net2 = "0.2"
num_cpus = "1.0"
serde = "1.0"
@@ -39,13 +39,13 @@ tokio-tls = { version = "0.1", optional = true }
[dev-dependencies]
chrono = "0.4"
env_logger = "0.4"
env_logger = "0.5"
futures-cpupool = "0.1"
clap = "2.0"
serde_bytes = "0.10"
[target.'cfg(target_os = "macos")'.dev-dependencies]
security-framework = "0.1"
security-framework = "0.2"
[features]
default = []

2
README.md
View File

@@ -37,7 +37,7 @@ arguments to tarpc fns.
Add to your `Cargo.toml` dependencies:
```toml
tarpc = "0.9.0"
tarpc = "0.10.0"
tarpc-plugins = "0.2.0"
```

5
RELEASES.md
View File

@@ -1,3 +1,8 @@
## 0.10.0 (2018-03-26)
## Breaking Changes
Updates bincode to version 1.0.
## 0.9.0 (2017-09-17)
## Breaking Changes

2
benches/latency.rs
View File

@@ -38,7 +38,7 @@ impl FutureService for Server {
#[cfg(test)]
#[bench]
fn latency(bencher: &mut Bencher) {
let _ = env_logger::init();
let _ = env_logger::try_init();
let mut reactor = reactor::Core::new().unwrap();
let (handle, server) = Server
.listen(

4
examples/concurrency.rs
View File

@@ -3,7 +3,7 @@
// Licensed under the MIT License, <LICENSE or http://opensource.org/licenses/MIT>.
// This file may not be copied, modified, or distributed except according to those terms.
#![feature(inclusive_range_syntax, conservative_impl_trait, plugin, never_type, use_extern_macros)]
#![feature(conservative_impl_trait, plugin, never_type, use_extern_macros)]
#![plugin(tarpc_plugins)]
extern crate chrono;
@@ -147,7 +147,7 @@ fn run_once(
}
fn main() {
let _ = env_logger::init();
env_logger::init();
let matches = App::new("Tarpc Concurrency")
.about(
"Demonstrates making concurrent requests to a tarpc service.",

4
examples/pubsub.rs
View File

@@ -117,12 +117,12 @@ impl publisher::FutureService for Publisher {
fn unsubscribe(&self, id: u32) -> Self::UnsubscribeFut {
println!("Unsubscribing {}", id);
self.clients.borrow_mut().remove(&id).unwrap();
futures::finished(()).boxed()
Box::new(futures::finished(()))
}
}
fn main() {
let _ = env_logger::init();
env_logger::init();
let mut reactor = reactor::Core::new().unwrap();
let (publisher_handle, server) = Publisher::new()
.listen(

11
examples/server_calling_server.rs
View File

@@ -14,7 +14,7 @@ extern crate tokio_core;
use add::{FutureService as AddFutureService, FutureServiceExt as AddExt};
use double::{FutureService as DoubleFutureService, FutureServiceExt as DoubleExt};
use futures::{BoxFuture, Future, Stream};
use futures::{Future, Stream};
use tarpc::future::{client, server};
use tarpc::future::client::ClientExt as Fc;
use tarpc::util::{FirstSocketAddr, Message, Never};
@@ -59,18 +59,17 @@ impl DoubleServer {
}
impl DoubleFutureService for DoubleServer {
type DoubleFut = BoxFuture<i32, Message>;
type DoubleFut = Box<Future<Item=i32, Error=Message>>;
fn double(&self, x: i32) -> Self::DoubleFut {
self.client
Box::new(self.client
.add(x, x)
.map_err(|e| e.to_string().into())
.boxed()
.map_err(|e| e.to_string().into()))
}
}
fn main() {
let _ = env_logger::init();
env_logger::init();
let mut reactor = reactor::Core::new().unwrap();
let (add, server) = AddServer
.listen(

2
examples/sync_server_calling_server.rs
View File

@@ -61,7 +61,7 @@ impl DoubleSyncService for DoubleServer {
}
fn main() {
let _ = env_logger::init();
env_logger::init();
let (tx, rx) = mpsc::channel();
thread::spawn(move || {
let handle = AddServer

2
examples/throughput.rs
View File

@@ -112,7 +112,7 @@ fn bench_tcp(target: u64) {
}
fn main() {
let _ = env_logger::init();
env_logger::init();
let _ = *BUF; // To non-lazily initialize it.
bench_tcp(256 << 20);
bench_tarpc(256 << 20);

2
examples/two_clients.rs
View File

@@ -56,7 +56,7 @@ impl baz::FutureService for Baz {
}
fn main() {
let _ = env_logger::init();
env_logger::init();
let bar_client = {
let (tx, rx) = mpsc::channel();
thread::spawn(move || {

4
src/future/server/connection.rs
View File

@@ -20,12 +20,12 @@ impl Tracker {
}
pub fn increment(&self) {
let _ = self.tx.send(Action::Increment);
let _ = self.tx.unbounded_send(Action::Increment);
}
pub fn decrement(&self) {
debug!("Closing connection");
let _ = self.tx.send(Action::Decrement);
let _ = self.tx.unbounded_send(Action::Decrement);
}
}

2
src/future/server/shutdown.rs
View File

@@ -36,7 +36,7 @@ impl Shutdown {
/// The returned future resolves when the server is completely shut down.
pub fn shutdown(&self) -> ShutdownFuture {
let (tx, rx) = oneshot::channel();
let inner = if self.tx.send(tx).is_err() {
let inner = if self.tx.unbounded_send(tx).is_err() {
trace!("Server already initiated shutdown.");
futures::Either::A(futures::ok(()))
} else {

24
src/macros.rs
View File

@@ -850,7 +850,7 @@ mod functional_test {
#[test]
fn simple() {
let _ = env_logger::init();
let _ = env_logger::try_init();
let (_, client, _) =
unwrap!(start_server_with_sync_client::<SyncClient, Server>(Server));
assert_eq!(3, client.add(1, 2).unwrap());
@@ -861,7 +861,7 @@ mod functional_test {
fn shutdown() {
use futures::{Async, Future};
let _ = env_logger::init();
let _ = env_logger::try_init();
let (addr, client, shutdown) =
unwrap!(start_server_with_sync_client::<SyncClient, Server>(Server));
assert_eq!(3, unwrap!(client.add(1, 2)));
@@ -897,7 +897,7 @@ mod functional_test {
#[test]
fn no_shutdown() {
let _ = env_logger::init();
let _ = env_logger::try_init();
let (addr, client, shutdown) =
unwrap!(start_server_with_sync_client::<SyncClient, Server>(Server));
assert_eq!(3, client.add(1, 2).unwrap());
@@ -913,7 +913,7 @@ mod functional_test {
#[test]
fn other_service() {
let _ = env_logger::init();
let _ = env_logger::try_init();
let (_, client, _) = unwrap!(start_server_with_sync_client::<
super::other_service::SyncClient,
Server,
@@ -989,7 +989,7 @@ mod functional_test {
#[test]
fn simple() {
let _ = env_logger::init();
let _ = env_logger::try_init();
let (_, mut reactor, client) = unwrap!(
start_server_with_async_client::<FutureClient, Server>(Server)
);
@@ -1005,7 +1005,7 @@ mod functional_test {
use futures::Future;
use tokio_core::reactor;
let _ = env_logger::init();
let _ = env_logger::try_init();
let (handle, mut reactor, server) = unwrap!(return_server::<Server>(Server));
let (tx, rx) = ::std::sync::mpsc::channel();
@@ -1027,7 +1027,7 @@ mod functional_test {
#[test]
fn concurrent() {
let _ = env_logger::init();
let _ = env_logger::try_init();
let (_, mut reactor, client) = unwrap!(
start_server_with_async_client::<FutureClient, Server>(Server)
);
@@ -1041,7 +1041,7 @@ mod functional_test {
#[test]
fn other_service() {
let _ = env_logger::init();
let _ = env_logger::try_init();
let (_, mut reactor, client) = unwrap!(start_server_with_async_client::<
super::other_service::FutureClient,
Server,
@@ -1058,7 +1058,7 @@ mod functional_test {
use future::server;
use super::FutureServiceExt;
let _ = env_logger::init();
let _ = env_logger::try_init();
let reactor = reactor::Core::new().unwrap();
let handle = Server
.listen(
@@ -1080,7 +1080,7 @@ mod functional_test {
use util::FirstSocketAddr;
use super::{FutureClient, FutureServiceExt};
let _ = env_logger::init();
let _ = env_logger::try_init();
let mut reactor = reactor::Core::new().unwrap();
let (handle, server) = Server
.listen(
@@ -1115,7 +1115,7 @@ mod functional_test {
use future::client::ClientExt;
use super::FutureServiceExt;
let _ = env_logger::init();
let _ = env_logger::try_init();
let (_, mut reactor, client) = unwrap!(
start_server_with_async_client::<FutureClient, Server>(Server)
);
@@ -1167,7 +1167,7 @@ mod functional_test {
fn error() {
use std::error::Error as E;
use self::error_service::*;
let _ = env_logger::init();
let _ = env_logger::try_init();
let (_, mut reactor, client) =
start_err_server_with_async_client::<FutureClient, ErrorServer>(ErrorServer).unwrap();

10
src/protocol.rs
View File

@@ -3,7 +3,7 @@
// Licensed under the MIT License, <LICENSE or http://opensource.org/licenses/MIT>.
// This file may not be copied, modified, or distributed except according to those terms.
use bincode::{self, Infinite};
use bincode;
use byteorder::{BigEndian, ReadBytesExt};
use bytes::BytesMut;
use bytes::buf::BufMut;
@@ -66,7 +66,9 @@ where
type Error = io::Error;
fn encode(&mut self, (id, message): Self::Item, buf: &mut BytesMut) -> io::Result<()> {
let payload_size = bincode::serialized_size(&message);
let payload_size = bincode::serialized_size(&message).map_err(|serialize_err| {
io::Error::new(io::ErrorKind::Other, serialize_err)
})?;
if payload_size > self.max_payload_size {
return Err(too_big(payload_size, self.max_payload_size));
}
@@ -75,7 +77,7 @@ where
buf.put_u64::<BigEndian>(id);
trace!("Encoded request id = {} as {:?}", id, buf);
buf.put_u64::<BigEndian>(payload_size);
bincode::serialize_into(&mut buf.writer(), &message, Infinite)
bincode::serialize_into(&mut buf.writer(), &message)
.map_err(|serialize_err| {
io::Error::new(io::ErrorKind::Other, serialize_err)
})?;
@@ -137,7 +139,7 @@ where
}
Payload { id, len } => {
let payload = buf.split_to(len as usize);
let result = bincode::deserialize_from(&mut Cursor::new(payload), Infinite);
let result = bincode::deserialize_from(&mut Cursor::new(payload));
// Reset the state machine because, either way, we're done processing this
// message.
self.state = Id;