From 0cc976b729a405bb410c556a2b2521cb828cf66c Mon Sep 17 00:00:00 2001 From: Tim Kuehn Date: Tue, 6 Nov 2018 17:01:27 -0800 Subject: [PATCH] cargo fmt --- bincode-transport/src/lib.rs | 8 +------- example-service/src/client.rs | 8 +------- example-service/src/server.rs | 8 +------- rpc/src/client/channel.rs | 3 +-- rpc/src/lib.rs | 27 ++++++--------------------- rpc/src/server/filter.rs | 8 ++------ rpc/src/server/mod.rs | 9 +++++++-- trace/src/lib.rs | 15 +++------------ 8 files changed, 22 insertions(+), 64 deletions(-) diff --git a/bincode-transport/src/lib.rs b/bincode-transport/src/lib.rs index 7c20481..a44bf0d 100644 --- a/bincode-transport/src/lib.rs +++ b/bincode-transport/src/lib.rs @@ -6,13 +6,7 @@ //! A TCP [`Transport`] that serializes as bincode. -#![feature( - futures_api, - pin, - arbitrary_self_types, - await_macro, - async_await -)] +#![feature(futures_api, pin, arbitrary_self_types, await_macro, async_await)] #![deny(missing_docs, missing_debug_implementations)] use self::compat::Compat; diff --git a/example-service/src/client.rs b/example-service/src/client.rs index 7ed3be3..c2b3512 100644 --- a/example-service/src/client.rs +++ b/example-service/src/client.rs @@ -4,13 +4,7 @@ // license that can be found in the LICENSE file or at // https://opensource.org/licenses/MIT. -#![feature( - futures_api, - pin, - arbitrary_self_types, - await_macro, - async_await -)] +#![feature(futures_api, pin, arbitrary_self_types, await_macro, async_await)] use clap::{App, Arg}; use futures::{compat::TokioDefaultSpawner, prelude::*}; diff --git a/example-service/src/server.rs b/example-service/src/server.rs index b8b77d2..0aeff40 100644 --- a/example-service/src/server.rs +++ b/example-service/src/server.rs @@ -4,13 +4,7 @@ // license that can be found in the LICENSE file or at // https://opensource.org/licenses/MIT. -#![feature( - futures_api, - pin, - arbitrary_self_types, - await_macro, - async_await -)] +#![feature(futures_api, pin, arbitrary_self_types, await_macro, async_await)] use clap::{App, Arg}; use futures::{ diff --git a/rpc/src/client/channel.rs b/rpc/src/client/channel.rs index 1a14190..405c4fc 100644 --- a/rpc/src/client/channel.rs +++ b/rpc/src/client/channel.rs @@ -6,9 +6,8 @@ use crate::{ context, - PollIo, util::{deadline_compat, AsDuration, Compact}, - ClientMessage, ClientMessageKind, Request, Response, Transport, + ClientMessage, ClientMessageKind, PollIo, Request, Response, Transport, }; use fnv::FnvHashMap; use futures::{ diff --git a/rpc/src/lib.rs b/rpc/src/lib.rs index fd451dc..23c6511 100644 --- a/rpc/src/lib.rs +++ b/rpc/src/lib.rs @@ -12,7 +12,7 @@ pin, arbitrary_self_types, await_macro, - async_await, + async_await )] #![deny(missing_docs, missing_debug_implementations)] @@ -50,10 +50,7 @@ use std::{cell::RefCell, io, sync::Once, time::SystemTime}; /// A message from a client to a server. #[derive(Debug)] -#[cfg_attr( - feature = "serde1", - derive(serde::Serialize, serde::Deserialize) -)] +#[cfg_attr(feature = "serde1", derive(serde::Serialize, serde::Deserialize))] #[non_exhaustive] pub struct ClientMessage { /// The trace context associates the message with a specific chain of causally-related actions, @@ -65,10 +62,7 @@ pub struct ClientMessage { /// Different messages that can be sent from a client to a server. #[derive(Debug)] -#[cfg_attr( - feature = "serde1", - derive(serde::Serialize, serde::Deserialize) -)] +#[cfg_attr(feature = "serde1", derive(serde::Serialize, serde::Deserialize))] #[non_exhaustive] pub enum ClientMessageKind { /// A request initiated by a user. The server responds to a request by invoking a @@ -90,10 +84,7 @@ pub enum ClientMessageKind { /// A request from a client to a server. #[derive(Debug)] -#[cfg_attr( - feature = "serde1", - derive(serde::Serialize, serde::Deserialize) -)] +#[cfg_attr(feature = "serde1", derive(serde::Serialize, serde::Deserialize))] #[non_exhaustive] pub struct Request { /// Uniquely identifies the request across all requests sent over a single channel. @@ -115,10 +106,7 @@ pub struct Request { /// A response from a server to a client. #[derive(Debug, PartialEq, Eq)] -#[cfg_attr( - feature = "serde1", - derive(serde::Serialize, serde::Deserialize) -)] +#[cfg_attr(feature = "serde1", derive(serde::Serialize, serde::Deserialize))] #[non_exhaustive] pub struct Response { /// The ID of the request being responded to. @@ -129,10 +117,7 @@ pub struct Response { /// An error response from a server to a client. #[derive(Debug, PartialEq, Eq)] -#[cfg_attr( - feature = "serde1", - derive(serde::Serialize, serde::Deserialize) -)] +#[cfg_attr(feature = "serde1", derive(serde::Serialize, serde::Deserialize))] #[non_exhaustive] pub struct ServerError { #[cfg_attr( diff --git a/rpc/src/server/filter.rs b/rpc/src/server/filter.rs index dd8e963..9412f0e 100644 --- a/rpc/src/server/filter.rs +++ b/rpc/src/server/filter.rs @@ -5,10 +5,9 @@ // https://opensource.org/licenses/MIT. use crate::{ - PollIo, server::{Channel, Config}, util::Compact, - ClientMessage, Response, Transport, + ClientMessage, PollIo, Response, Transport, }; use fnv::FnvHashMap; use futures::{ @@ -230,10 +229,7 @@ where { type Item = io::Result>; - fn poll_next( - mut self: Pin<&mut Self>, - cx: &LocalWaker, - ) -> PollIo> { + fn poll_next(mut self: Pin<&mut Self>, cx: &LocalWaker) -> PollIo> { loop { match (self.poll_listener(cx)?, self.poll_closed_connections(cx)?) { (Poll::Ready(Some(NewConnection::Accepted(channel))), _) => { diff --git a/rpc/src/server/mod.rs b/rpc/src/server/mod.rs index 5d5a9eb..9c3f637 100644 --- a/rpc/src/server/mod.rs +++ b/rpc/src/server/mod.rs @@ -181,7 +181,8 @@ where Req: Send, Resp: Send, T: Transport, SinkItem = Response> + Send, -{} +{ +} /// Responds to all requests with `request_handler`. /// The server end of an open connection with a client. @@ -402,7 +403,11 @@ where match ready!(self.pending_responses().poll_next(cx)) { Some((ctx, response)) => { - if self.in_flight_requests().remove(&response.request_id).is_some() { + if self + .in_flight_requests() + .remove(&response.request_id) + .is_some() + { self.in_flight_requests().compact(0.1); } trace!( diff --git a/trace/src/lib.rs b/trace/src/lib.rs index 5c67a0b..4255d07 100644 --- a/trace/src/lib.rs +++ b/trace/src/lib.rs @@ -27,10 +27,7 @@ use std::{ /// Consists of a span identifying an event, an optional parent span identifying a causal event /// that triggered the current span, and a trace with which all related spans are associated. #[derive(Debug, PartialEq, Eq, Hash, Clone, Copy)] -#[cfg_attr( - feature = "serde", - derive(serde::Serialize, serde::Deserialize) -)] +#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))] pub struct Context { /// An identifier of the trace associated with the current context. A trace ID is typically /// created at a root span and passed along through all causal events. @@ -50,18 +47,12 @@ pub struct Context { /// A 128-bit UUID identifying a trace. All spans caused by the same originating span share the /// same trace ID. #[derive(Debug, PartialEq, Eq, Hash, Clone, Copy)] -#[cfg_attr( - feature = "serde", - derive(serde::Serialize, serde::Deserialize) -)] +#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))] pub struct TraceId(u128); /// A 64-bit identifier of a span within a trace. The identifier is unique within the span's trace. #[derive(Debug, PartialEq, Eq, Hash, Clone, Copy)] -#[cfg_attr( - feature = "serde", - derive(serde::Serialize, serde::Deserialize) -)] +#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))] pub struct SpanId(u64); impl Context {