From 7fda862fb85b510ed94de968ea634fe11183a438 Mon Sep 17 00:00:00 2001 From: Tim Kuehn Date: Tue, 18 Aug 2020 02:55:24 -0700 Subject: [PATCH] Run cargo fmt --- example-service/src/client.rs | 7 ++++--- tarpc/src/serde_transport.rs | 16 ++++++++++++---- 2 files changed, 16 insertions(+), 7 deletions(-) diff --git a/example-service/src/client.rs b/example-service/src/client.rs index 96bb52b..1e9d112 100644 --- a/example-service/src/client.rs +++ b/example-service/src/client.rs @@ -7,9 +7,9 @@ use clap::{App, Arg}; use std::{io, net::SocketAddr}; use tarpc::{client, context}; +use tokio::net::TcpStream; use tokio_serde::formats::Json; use tokio_util::codec::LengthDelimitedCodec; -use tokio::net::TcpStream; #[tokio::main] async fn main() -> io::Result<()> { @@ -47,11 +47,12 @@ async fn main() -> io::Result<()> { let conn = TcpStream::connect(server_addr).await?; let transport = tarpc::serde_transport::new( - LengthDelimitedCodec::builder().max_frame_length(4294967296).new_framed(conn), + LengthDelimitedCodec::builder() + .max_frame_length(4294967296) + .new_framed(conn), Json::default(), ); - // WorldClient is generated by the service attribute. It has a constructor `new` that takes a // config and any Transport as input. let mut client = service::WorldClient::new(client::Config::default(), transport).spawn()?; diff --git a/tarpc/src/serde_transport.rs b/tarpc/src/serde_transport.rs index f43ee56..1bfed3a 100644 --- a/tarpc/src/serde_transport.rs +++ b/tarpc/src/serde_transport.rs @@ -14,7 +14,10 @@ use serde::{Deserialize, Serialize}; use std::{error::Error, io, pin::Pin}; use tokio::io::{AsyncRead, AsyncWrite}; use tokio_serde::{Framed as SerdeFramed, *}; -use tokio_util::codec::{length_delimited::{self, LengthDelimitedCodec}, Framed}; +use tokio_util::codec::{ + length_delimited::{self, LengthDelimitedCodec}, + Framed, +}; /// A transport that serializes to, and deserializes from, a byte stream. #[pin_project] @@ -91,8 +94,10 @@ fn convert>>( } /// Constructs a new transport from a framed transport and a serialization codec. -pub fn new(framed_io: Framed, codec: Codec) - -> Transport +pub fn new( + framed_io: Framed, + codec: Codec, +) -> Transport where S: AsyncWrite + AsyncRead, Item: for<'de> Deserialize<'de>, @@ -158,7 +163,10 @@ pub mod tcp { SinkItem: Serialize, Codec: Serializer + Deserializer, { - Ok(new(Framed::new(TcpStream::connect(addr).await?, config), codec)) + Ok(new( + Framed::new(TcpStream::connect(addr).await?, config), + codec, + )) } /// Connects to `addr`, wrapping the connection in a JSON transport.