diff --git a/example-service/Cargo.toml b/example-service/Cargo.toml index ea9f7cf..e919166 100644 --- a/example-service/Cargo.toml +++ b/example-service/Cargo.toml @@ -19,8 +19,6 @@ futures = "0.3" serde = { version = "1.0" } tarpc = { version = "0.23", path = "../tarpc", features = ["full"] } tokio = { version = "0.3", features = ["full"] } -tokio-serde = { version = "0.7.1", features = ["json"] } -tokio-util = { version = "0.5", features = ["codec"] } [lib] name = "service" diff --git a/example-service/src/client.rs b/example-service/src/client.rs index a692500..cd08a18 100644 --- a/example-service/src/client.rs +++ b/example-service/src/client.rs @@ -6,8 +6,7 @@ use clap::{App, Arg}; use std::{io, net::SocketAddr}; -use tarpc::{client, context}; -use tokio_serde::formats::Json; +use tarpc::{client, context, tokio_serde::formats::Json}; #[tokio::main] async fn main() -> io::Result<()> { diff --git a/example-service/src/server.rs b/example-service/src/server.rs index 9048801..fd12d60 100644 --- a/example-service/src/server.rs +++ b/example-service/src/server.rs @@ -14,8 +14,8 @@ use std::{ use tarpc::{ context, server::{self, Channel, Handler}, + tokio_serde::formats::Json, }; -use tokio_serde::formats::Json; // This is the type that implements the generated World trait. It is the business logic // and is used to start the server. diff --git a/tarpc/Cargo.toml b/tarpc/Cargo.toml index da17f76..9cfbaa2 100644 --- a/tarpc/Cargo.toml +++ b/tarpc/Cargo.toml @@ -17,7 +17,7 @@ default = [] serde1 = ["tarpc-plugins/serde1", "serde", "serde/derive"] tokio1 = ["tokio/rt-multi-thread"] -serde-transport = ["tokio-serde", "tokio-util/codec"] +serde-transport = ["tokio-serde/json", "tokio-util/codec"] tcp = ["tokio/net", "tokio/stream"] full = ["serde1", "tokio1", "serde-transport", "tcp"] diff --git a/tarpc/src/lib.rs b/tarpc/src/lib.rs index 4a24b06..60a2f3a 100644 --- a/tarpc/src/lib.rs +++ b/tarpc/src/lib.rs @@ -206,6 +206,9 @@ pub use rpc::*; #[cfg(feature = "serde1")] pub use serde; +#[cfg(feature = "serde-transport")] +pub use tokio_serde; + #[cfg(feature = "serde-transport")] #[cfg_attr(docsrs, doc(cfg(feature = "serde-transport")))] pub mod serde_transport;