From fc2e07e883401f0639faf0f890556b9d4a804972 Mon Sep 17 00:00:00 2001 From: Eliza Weisman Date: Fri, 21 Sep 2018 14:43:06 -0700 Subject: [PATCH] rustfmt all the things --- tokio-trace/src/dedup.rs | 22 ++++++-------- tokio-trace/src/dispatcher.rs | 14 ++++----- tokio-trace/src/lib.rs | 56 ++++++++++++----------------------- tokio-trace/src/subscriber.rs | 26 +++++++++------- 4 files changed, 49 insertions(+), 69 deletions(-) diff --git a/tokio-trace/src/dedup.rs b/tokio-trace/src/dedup.rs index 16dee39f..f739b73c 100644 --- a/tokio-trace/src/dedup.rs +++ b/tokio-trace/src/dedup.rs @@ -14,10 +14,7 @@ pub trait IteratorDedup: Iterator + Sized { } } -impl IteratorDedup for I -where - I: Iterator + Sized, -{} +impl IteratorDedup for I where I: Iterator + Sized {} pub struct DedupBy &K, K> { f: F, @@ -34,16 +31,15 @@ where type Item = ::Item; fn next(&mut self) -> Option<::Item> { let f = &self.f; - let result = - if self.emit { - self.inner.next() - } else { - let first = match self.inner.next() { - None => return None, - Some(first) => first, - }; - self.inner.find(|item| (f)(&first) != (f)(item)) + let result = if self.emit { + self.inner.next() + } else { + let first = match self.inner.next() { + None => return None, + Some(first) => first, }; + self.inner.find(|item| (f)(&first) != (f)(item)) + }; self.emit = result.as_ref().map(f) != self.inner.peek().map(f); result } diff --git a/tokio-trace/src/dispatcher.rs b/tokio-trace/src/dispatcher.rs index 474f3ca0..32ac3389 100644 --- a/tokio-trace/src/dispatcher.rs +++ b/tokio-trace/src/dispatcher.rs @@ -1,11 +1,8 @@ -use ::{ - Event, Span, - subscriber::Subscriber, -}; +use {subscriber::Subscriber, Event, Span}; use std::{ - time::SystemTime, sync::atomic::{AtomicUsize, Ordering, ATOMIC_USIZE_INIT}, + time::SystemTime, }; static STATE: AtomicUsize = ATOMIC_USIZE_INIT; @@ -71,7 +68,7 @@ impl Subscriber for Builder { #[inline] fn exit(&self, span: &Span, at: SystemTime) { - for subscriber in &self.subscribers { + for subscriber in &self.subscribers { subscriber.exit(span, at) } } @@ -89,7 +86,6 @@ impl Dispatcher { } } - impl Subscriber for Dispatcher { #[inline] fn observe_event<'event>(&self, event: &'event Event<'event>) { @@ -118,7 +114,7 @@ impl Subscriber for NoDispatcher { // TODO: should this panic instead? } - fn enter(&self, _span: &Span, _at: SystemTime) { } + fn enter(&self, _span: &Span, _at: SystemTime) {} - fn exit(&self, _span: &Span, _at: SystemTime) { } + fn exit(&self, _span: &Span, _at: SystemTime) {} } diff --git a/tokio-trace/src/lib.rs b/tokio-trace/src/lib.rs index daaae0cf..a9ed1991 100644 --- a/tokio-trace/src/lib.rs +++ b/tokio-trace/src/lib.rs @@ -3,17 +3,10 @@ extern crate log; #[macro_use] extern crate lazy_static; -pub use log::Level; pub use self::subscriber::Subscriber; +pub use log::Level; -use std::{ - cmp, - cell::RefCell, - fmt, - time::SystemTime, - sync::Arc, - slice, -}; +use std::{cell::RefCell, cmp, fmt, slice, sync::Arc, time::SystemTime}; use self::dedup::IteratorDedup; @@ -91,18 +84,18 @@ thread_local! { static CURRENT_SPAN: RefCell = RefCell::new(ROOT_SPAN.clone()); } -pub mod subscriber; -mod dispatcher; mod dedup; +mod dispatcher; +pub mod subscriber; -pub use dispatcher::{Dispatcher, Builder as DispatcherBuilder}; +pub use dispatcher::{Builder as DispatcherBuilder, Dispatcher}; // XXX: im using fmt::Debug for prototyping purposes, it should probably leave. pub trait Value: fmt::Debug + Send + Sync { // ... ? } -impl Value for T where T: fmt::Debug + Send + Sync { } +impl Value for T where T: fmt::Debug + Send + Sync {} pub struct Event<'event> { pub timestamp: SystemTime, @@ -143,7 +136,6 @@ struct SpanInner { pub static_meta: &'static StaticMeta, pub field_values: Vec>, - // ... } @@ -156,9 +148,7 @@ pub struct Parents<'a> { impl<'event> Event<'event> { pub fn field_names(&self) -> slice::Iter<&'static str> { - self.static_meta - .field_names - .iter() + self.static_meta.field_names.iter() } pub fn fields(&'event self) -> impl Iterator { @@ -173,14 +163,13 @@ impl<'event> Event<'event> { pub fn parents<'a>(&'a self) -> Parents<'a> { Parents { - next: Some(&self.parent) + next: Some(&self.parent), } } pub fn all_fields<'a>(&'a self) -> impl Iterator { self.fields() - .chain(self.parents() - .flat_map(|parent| parent.fields())) + .chain(self.parents().flat_map(|parent| parent.fields())) .dedup_by(|(k, _)| k) } } @@ -208,14 +197,12 @@ impl Span { parent: Some(parent), static_meta, field_values, - }) + }), } } pub fn current() -> Self { - CURRENT_SPAN.with(|span| { - span.borrow().clone() - }) + CURRENT_SPAN.with(|span| span.borrow().clone()) } pub fn name(&self) -> Option<&'static str> { @@ -231,10 +218,7 @@ impl Span { } pub fn field_names(&self) -> slice::Iter<&'static str> { - self.inner - .static_meta - .field_names - .iter() + self.inner.static_meta.field_names.iter() } pub fn fields<'a>(&'a self) -> impl Iterator { @@ -264,23 +248,21 @@ impl Span { } pub fn parents<'a>(&'a self) -> Parents<'a> { - Parents { - next: Some(self) - } + Parents { next: Some(self) } } } impl cmp::PartialEq for SpanInner { fn eq(&self, other: &SpanInner) -> bool { - self.opened_at == other.opened_at && - self.name == other.name && - self.static_meta == other.static_meta + self.opened_at == other.opened_at + && self.name == other.name + && self.static_meta == other.static_meta } } impl<'a> IntoIterator for &'a Span { type Item = (&'static str, &'a dyn Value); - type IntoIter = Box +'a>; // TODO: unbox + type IntoIter = Box + 'a>; // TODO: unbox fn into_iter(self) -> Self::IntoIter { Box::new(self.fields()) } @@ -288,7 +270,7 @@ impl<'a> IntoIterator for &'a Span { impl<'a> IntoIterator for &'a Event<'a> { type Item = (&'static str, &'a dyn Value); - type IntoIter = Box +'a>; // TODO: unbox + type IntoIter = Box + 'a>; // TODO: unbox fn into_iter(self) -> Self::IntoIter { Box::new(self.fields()) } @@ -298,7 +280,7 @@ pub struct DebugFields<'a, I: 'a>(&'a I) where &'a I: IntoIterator; -impl<'a, I:'a > fmt::Debug for DebugFields<'a, I> +impl<'a, I: 'a> fmt::Debug for DebugFields<'a, I> where &'a I: IntoIterator, { diff --git a/tokio-trace/src/subscriber.rs b/tokio-trace/src/subscriber.rs index 1aaf8eb3..92135efb 100644 --- a/tokio-trace/src/subscriber.rs +++ b/tokio-trace/src/subscriber.rs @@ -1,5 +1,5 @@ use super::{Event, Span, StaticMeta}; -use ::log; +use log; use std::time::SystemTime; pub trait Subscriber { @@ -22,18 +22,24 @@ impl Subscriber for LogSubscriber { let meta = event.static_meta.into(); let logger = log::logger(); if logger.enabled(&meta) { - logger.log(&log::Record::builder() - .metadata(meta) - .module_path(Some(event.static_meta.module_path)) - .file(Some(event.static_meta.file)) - .line(Some(event.static_meta.line)) - .args(format_args!("[{}] {:?} {}", event.parent.name().unwrap_or("???"), fields, event.message)) - .build()); + logger.log( + &log::Record::builder() + .metadata(meta) + .module_path(Some(event.static_meta.module_path)) + .file(Some(event.static_meta.file)) + .line(Some(event.static_meta.line)) + .args(format_args!( + "[{}] {:?} {}", + event.parent.name().unwrap_or("???"), + fields, + event.message + )).build(), + ); } } - fn enter(&self, _span: &Span, _at: SystemTime) { } - fn exit(&self, _span: &Span, _at: SystemTime) { } + fn enter(&self, _span: &Span, _at: SystemTime) {} + fn exit(&self, _span: &Span, _at: SystemTime) {} } impl<'a, 'b> Into> for &'b StaticMeta {