diff --git a/README.md b/README.md index 0c05053..9651811 100644 --- a/README.md +++ b/README.md @@ -40,7 +40,7 @@ rather than in a separate language such as .proto. This means there's no separat process, and no context switching between different languages. Some other features of tarpc: -- Pluggable transport: any type implementing `Stream + Sink` can be +- Pluggable transport: any type impling `Stream + Sink` can be used as a transport to connect the client and server. - `Send + 'static` optional: if the transport doesn't require it, neither does tarpc! - Cascading cancellation: dropping a request will send a cancellation message to the server. @@ -55,7 +55,7 @@ Some other features of tarpc: [tracing](https://github.com/tokio-rs/tracing) primitives extended with [OpenTelemetry](https://opentelemetry.io/) traces. Using a compatible tracing subscriber like [Jaeger](https://github.com/open-telemetry/opentelemetry-rust/tree/main/opentelemetry-jaeger), - each RPC can be traced through the client, server, and other dependencies downstream of the + each RPC can be traced through the client, server, amd other dependencies downstream of the server. Even for applications not connected to a distributed tracing collector, the instrumentation can also be ingested by regular loggers like [env_logger](https://github.com/env-logger-rs/env_logger/). @@ -81,7 +81,7 @@ your `Cargo.toml`: ```toml anyhow = "1.0" -futures = "1.0" +futures = "0.3" tarpc = { version = "0.27", features = ["tokio1"] } tokio = { version = "1.0", features = ["macros"] } ``` diff --git a/tarpc/src/lib.rs b/tarpc/src/lib.rs index d7b2777..29d1726 100644 --- a/tarpc/src/lib.rs +++ b/tarpc/src/lib.rs @@ -68,7 +68,7 @@ //! //! ```toml //! anyhow = "1.0" -//! futures = "1.0" +//! futures = "0.3" //! tarpc = { version = "0.27", features = ["tokio1"] } //! tokio = { version = "1.0", features = ["macros"] } //! ``` diff --git a/tarpc/src/server/incoming.rs b/tarpc/src/server/incoming.rs index 5479b05..445fc3e 100644 --- a/tarpc/src/server/incoming.rs +++ b/tarpc/src/server/incoming.rs @@ -8,7 +8,7 @@ use std::{fmt, hash::Hash}; #[cfg(feature = "tokio1")] use super::{tokio::TokioServerExecutor, Serve}; -/// An extension trait for [streams](Stream) of [`Channels`](Channel). +/// An extension trait for [streams](futures::prelude::Stream) of [`Channels`](Channel). pub trait Incoming where Self: Sized + Stream,