Use real crate names rather than internal aliases. It's less confusing for people reading examples.

This commit is contained in:
Tim Kuehn
2019-08-09 01:16:06 -07:00
parent d560ac6197
commit f974533bf7
8 changed files with 18 additions and 18 deletions

View File

@@ -13,7 +13,7 @@ readme = "../README.md"
description = "An example server built on tarpc."
[dependencies]
json-transport = { package = "tarpc-json-transport", version = "0.1", path = "../json-transport" }
tarpc-json-transport = { version = "0.1", path = "../json-transport" }
clap = "2.0"
futures-preview = { version = "0.3.0-alpha.17" }
serde = { version = "1.0" }

View File

@@ -42,7 +42,7 @@ async fn main() -> io::Result<()> {
let name = flags.value_of("name").unwrap().into();
let transport = json_transport::connect(&server_addr).await?;
let transport = tarpc_json_transport::connect(&server_addr).await?;
// WorldClient is generated by the service attribute. It has a constructor `new` that takes a
// config and any Transport as input.

View File

@@ -65,7 +65,7 @@ async fn main() -> io::Result<()> {
// bincode_transport is provided by the associated crate bincode-transport. It makes it easy
// to start up a serde-powered bincode serialization strategy over TCP.
json_transport::listen(&server_addr)?
tarpc_json_transport::listen(&server_addr)?
// Ignore accept errors.
.filter_map(|r| future::ready(r.ok()))
.map(server::BaseChannel::with_defaults)

View File

@@ -28,7 +28,7 @@ tarpc-plugins = { path = "../plugins", version = "0.5.0" }
[dev-dependencies]
assert_matches = "1.0"
bincode = "1.0"
bincode-transport = { package = "tarpc-bincode-transport", version = "0.7", path = "../bincode-transport" }
tarpc-bincode-transport = { version = "0.7", path = "../bincode-transport" }
bytes = { version = "0.4", features = ["serde"] }
env_logger = "0.6"
futures-preview = { version = "0.3.0-alpha.17" }

View File

@@ -60,7 +60,7 @@ impl subscriber::Subscriber for Subscriber {
impl Subscriber {
async fn listen(id: u32, config: server::Config) -> io::Result<SocketAddr> {
let incoming = bincode_transport::listen(&"0.0.0.0:0".parse().unwrap())?
let incoming = tarpc_bincode_transport::listen(&"0.0.0.0:0".parse().unwrap())?
.filter_map(|r| future::ready(r.ok()));
let addr = incoming.get_ref().local_addr();
tokio::spawn(
@@ -114,7 +114,7 @@ impl publisher::Publisher for Publisher {
id: u32,
addr: SocketAddr,
) -> io::Result<()> {
let conn = bincode_transport::connect(&addr).await?;
let conn = tarpc_bincode_transport::connect(&addr).await?;
let subscriber =
subscriber::SubscriberClient::new(client::Config::default(), conn).spawn()?;
eprintln!("Subscribing {}.", id);
@@ -144,7 +144,7 @@ impl publisher::Publisher for Publisher {
async fn main() -> io::Result<()> {
env_logger::init();
let transport = bincode_transport::listen(&"0.0.0.0:0".parse().unwrap())?
let transport = tarpc_bincode_transport::listen(&"0.0.0.0:0".parse().unwrap())?
.filter_map(|r| future::ready(r.ok()));
let publisher_addr = transport.get_ref().local_addr();
tokio::spawn(
@@ -157,7 +157,7 @@ async fn main() -> io::Result<()> {
let subscriber1 = Subscriber::listen(0, server::Config::default()).await?;
let subscriber2 = Subscriber::listen(1, server::Config::default()).await?;
let publisher_conn = bincode_transport::connect(&publisher_addr);
let publisher_conn = tarpc_bincode_transport::connect(&publisher_addr);
let publisher_conn = publisher_conn.await?;
let mut publisher =
publisher::PublisherClient::new(client::Config::default(), publisher_conn).spawn()?;

View File

@@ -41,9 +41,9 @@ impl World for HelloServer {
#[tokio::main]
async fn main() -> io::Result<()> {
// bincode_transport is provided by the associated crate bincode-transport. It makes it easy
// to start up a serde-powered bincode serialization strategy over TCP.
let mut transport = bincode_transport::listen(&"0.0.0.0:0".parse().unwrap())?;
// tarpc_bincode_transport is provided by the associated crate bincode-transport. It makes it
// easy to start up a serde-powered bincode serialization strategy over TCP.
let mut transport = tarpc_bincode_transport::listen(&"0.0.0.0:0".parse().unwrap())?;
let addr = transport.local_addr();
let server = async move {
@@ -63,7 +63,7 @@ async fn main() -> io::Result<()> {
};
tokio::spawn(server);
let transport = bincode_transport::connect(&addr).await?;
let transport = tarpc_bincode_transport::connect(&addr).await?;
// WorldClient is generated by the tarpc::service attribute. It has a constructor `new` that
// takes a config and any Transport as input.

View File

@@ -68,7 +68,7 @@ impl DoubleService for DoubleServer {
async fn main() -> io::Result<()> {
env_logger::init();
let add_listener = bincode_transport::listen(&"0.0.0.0:0".parse().unwrap())?
let add_listener = tarpc_bincode_transport::listen(&"0.0.0.0:0".parse().unwrap())?
.filter_map(|r| future::ready(r.ok()));
let addr = add_listener.get_ref().local_addr();
let add_server = Server::default()
@@ -77,10 +77,10 @@ async fn main() -> io::Result<()> {
.respond_with(AddServer.serve());
tokio::spawn(add_server);
let to_add_server = bincode_transport::connect(&addr).await?;
let to_add_server = tarpc_bincode_transport::connect(&addr).await?;
let add_client = add::AddClient::new(client::Config::default(), to_add_server).spawn()?;
let double_listener = bincode_transport::listen(&"0.0.0.0:0".parse().unwrap())?
let double_listener = tarpc_bincode_transport::listen(&"0.0.0.0:0".parse().unwrap())?
.filter_map(|r| future::ready(r.ok()));
let addr = double_listener.get_ref().local_addr();
let double_server = rpc::Server::default()
@@ -89,7 +89,7 @@ async fn main() -> io::Result<()> {
.respond_with(DoubleServer { add_client }.serve());
tokio::spawn(double_server);
let to_double_server = bincode_transport::connect(&addr).await?;
let to_double_server = tarpc_bincode_transport::connect(&addr).await?;
let mut double_client =
double::DoubleClient::new(client::Config::default(), to_double_server).spawn()?;

View File

@@ -63,7 +63,7 @@ async fn sequential() -> io::Result<()> {
async fn serde() -> io::Result<()> {
let _ = env_logger::try_init();
let transport = bincode_transport::listen(&([0, 0, 0, 0], 56789).into())?;
let transport = tarpc_bincode_transport::listen(&([0, 0, 0, 0], 56789).into())?;
let addr = transport.local_addr();
tokio::spawn(
tarpc::Server::default()
@@ -71,7 +71,7 @@ async fn serde() -> io::Result<()> {
.respond_with(Server.serve()),
);
let transport = bincode_transport::connect(&addr).await?;
let transport = tarpc_bincode_transport::connect(&addr).await?;
let mut client = ServiceClient::new(client::Config::default(), transport).spawn()?;
assert_matches!(client.add(context::current(), 1, 2).await, Ok(3));