From 15025b89c11ef81da06ad326cb158c9dfa9567ae Mon Sep 17 00:00:00 2001 From: Nikolay Kim Date: Fri, 24 Dec 2021 03:54:57 +0600 Subject: [PATCH] fmt --- ntex-bytes/src/buf/uninit_slice.rs | 8 ++----- ntex-bytes/src/bytes.rs | 9 +++----- ntex-bytes/tests/test_bytes.rs | 4 +--- ntex-macros/tests/test_macro.rs | 4 ++-- ntex-router/src/de.rs | 34 +++++++++--------------------- ntex-router/src/path.rs | 4 +--- ntex-router/src/resource.rs | 6 ++---- ntex-router/src/router.rs | 5 +---- ntex-router/src/tree.rs | 16 ++++---------- ntex-rt/src/arbiter.rs | 12 ++++------- ntex-rt/src/tokio.rs | 4 +--- ntex-util/src/channel/mpsc.rs | 5 +---- ntex-util/src/time/wheel.rs | 3 +-- rustfmt.toml | 2 +- 14 files changed, 34 insertions(+), 82 deletions(-) diff --git a/ntex-bytes/src/buf/uninit_slice.rs b/ntex-bytes/src/buf/uninit_slice.rs index b8b212f9..9b16eb6e 100644 --- a/ntex-bytes/src/buf/uninit_slice.rs +++ b/ntex-bytes/src/buf/uninit_slice.rs @@ -1,8 +1,7 @@ use core::fmt; use core::mem::MaybeUninit; use core::ops::{ - Index, IndexMut, Range, RangeFrom, RangeFull, RangeInclusive, RangeTo, - RangeToInclusive, + Index, IndexMut, Range, RangeFrom, RangeFull, RangeInclusive, RangeTo, RangeToInclusive, }; /// Uninitialized byte slice. @@ -42,10 +41,7 @@ impl UninitSlice { /// let slice = unsafe { UninitSlice::from_raw_parts_mut(ptr, len) }; /// ``` #[inline] - pub unsafe fn from_raw_parts_mut<'a>( - ptr: *mut u8, - len: usize, - ) -> &'a mut UninitSlice { + pub unsafe fn from_raw_parts_mut<'a>(ptr: *mut u8, len: usize) -> &'a mut UninitSlice { let maybe_init: &mut [MaybeUninit] = core::slice::from_raw_parts_mut(ptr as *mut _, len); &mut *(maybe_init as *mut [MaybeUninit] as *mut UninitSlice) diff --git a/ntex-bytes/src/bytes.rs b/ntex-bytes/src/bytes.rs index 7a26be64..bdd4eb12 100644 --- a/ntex-bytes/src/bytes.rs +++ b/ntex-bytes/src/bytes.rs @@ -466,8 +466,7 @@ impl Bytes { } } else { Bytes { - inner: BytesMut::copy_from_slice_in(data, PoolId::DEFAULT.pool_ref()) - .inner, + inner: BytesMut::copy_from_slice_in(data, PoolId::DEFAULT.pool_ref()).inner, } } } @@ -717,8 +716,7 @@ impl Bytes { } } else { Bytes { - inner: BytesMut::copy_from_slice_in_priv(self, self.inner.pool()) - .inner, + inner: BytesMut::copy_from_slice_in_priv(self, self.inner.pool()).inner, } }; } @@ -2369,8 +2367,7 @@ impl Inner { let new_cap = len + additional; // Promote to a vector - *self = - Inner::from_slice(new_cap, self.as_ref(), PoolId::DEFAULT.pool_ref()); + *self = Inner::from_slice(new_cap, self.as_ref(), PoolId::DEFAULT.pool_ref()); return; } diff --git a/ntex-bytes/tests/test_bytes.rs b/ntex-bytes/tests/test_bytes.rs index c69729bc..9d7534d1 100644 --- a/ntex-bytes/tests/test_bytes.rs +++ b/ntex-bytes/tests/test_bytes.rs @@ -26,9 +26,7 @@ fn test_size() { assert_eq!(32, std::mem::size_of::>()); let mut t = BytesMut::new(); - t.extend_from_slice( - &b"\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"[..], - ); + t.extend_from_slice(&b"\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"[..]); let val = t.freeze(); assert!(val.is_inline()); diff --git a/ntex-macros/tests/test_macro.rs b/ntex-macros/tests/test_macro.rs index 50f1ea77..0ee4da5a 100644 --- a/ntex-macros/tests/test_macro.rs +++ b/ntex-macros/tests/test_macro.rs @@ -2,8 +2,8 @@ use futures::{future, Future}; use ntex::http::{Method, StatusCode}; use ntex::web::{test, types::Path, App, Error, HttpResponse, HttpResponseBuilder}; use ntex_macros::{ - web_connect, web_delete, web_get, web_head, web_options, web_patch, web_post, - web_put, web_trace, + web_connect, web_delete, web_get, web_head, web_options, web_patch, web_post, web_put, + web_trace, }; // Make sure that we can name function as 'config' diff --git a/ntex-router/src/de.rs b/ntex-router/src/de.rs index fe8cc983..8b274c63 100644 --- a/ntex-router/src/de.rs +++ b/ntex-router/src/de.rs @@ -26,11 +26,8 @@ macro_rules! parse_single_value { { if self.path.len() != 1 { Err(de::value::Error::custom( - format!( - "wrong number of parameters: {} expected 1", - self.path.len() - ) - .as_str(), + format!("wrong number of parameters: {} expected 1", self.path.len()) + .as_str(), )) } else { let v = self.path[0].parse().map_err(|_| { @@ -109,11 +106,7 @@ impl<'de, T: ResourcePath + 'de> Deserializer<'de> for PathDeserializer<'de, T> visitor.visit_newtype_struct(self) } - fn deserialize_tuple( - self, - len: usize, - visitor: V, - ) -> Result + fn deserialize_tuple(self, len: usize, visitor: V) -> Result where V: Visitor<'de>, { @@ -562,8 +555,7 @@ mod tests { assert_eq!(s.0, "name"); assert_eq!(s.1, "user1"); - let s: &str = - de::Deserialize::deserialize(PathDeserializer::new(&path)).unwrap(); + let s: &str = de::Deserialize::deserialize(PathDeserializer::new(&path)).unwrap(); assert_eq!(s, "name"); let mut path = Path::new("/name/user1/"); @@ -572,8 +564,7 @@ mod tests { ("value", PathItem::Static("32")), ]; - let s: Test1 = - de::Deserialize::deserialize(PathDeserializer::new(&path)).unwrap(); + let s: Test1 = de::Deserialize::deserialize(PathDeserializer::new(&path)).unwrap(); assert_eq!(s.0, "name"); assert_eq!(s.1, 32); @@ -583,8 +574,7 @@ mod tests { assert_eq!((s.0).0, "name"); assert_eq!((s.0).1, 32); - let s: Test2 = - de::Deserialize::deserialize(PathDeserializer::new(&path)).unwrap(); + let s: Test2 = de::Deserialize::deserialize(PathDeserializer::new(&path)).unwrap(); assert_eq!(s.key, "name"); assert_eq!(s.value, 32); @@ -624,8 +614,7 @@ mod tests { let i: i8 = de::Deserialize::deserialize(PathDeserializer::new(&path)).unwrap(); assert_eq!(i, 32); - let i: (i8,) = - de::Deserialize::deserialize(PathDeserializer::new(&path)).unwrap(); + let i: (i8,) = de::Deserialize::deserialize(PathDeserializer::new(&path)).unwrap(); assert_eq!(i, (32,)); let i: Result<(i8, i8), _> = @@ -634,13 +623,11 @@ mod tests { #[derive(Deserialize)] struct Test(i8); - let i: Test = - de::Deserialize::deserialize(PathDeserializer::new(&path)).unwrap(); + let i: Test = de::Deserialize::deserialize(PathDeserializer::new(&path)).unwrap(); assert_eq!(i.0, 32); path.segments.push(("value2", PathItem::Static("32"))); - let i: Result = - de::Deserialize::deserialize(PathDeserializer::new(&path)); + let i: Result = de::Deserialize::deserialize(PathDeserializer::new(&path)); assert!(i.is_err()); } @@ -666,8 +653,7 @@ mod tests { fn test_extract_enum_value() { let mut path = Path::new("/val1/"); path.segments = vec![("val", PathItem::Static("val1"))]; - let i: Test3 = - de::Deserialize::deserialize(PathDeserializer::new(&path)).unwrap(); + let i: Test3 = de::Deserialize::deserialize(PathDeserializer::new(&path)).unwrap(); assert_eq!(i.val, TestEnum::Val1); let mut path = Path::new("/val3/"); diff --git a/ntex-router/src/path.rs b/ntex-router/src/path.rs index 99179482..aa8b5b01 100644 --- a/ntex-router/src/path.rs +++ b/ntex-router/src/path.rs @@ -163,9 +163,7 @@ impl Path { } /// Try to deserialize matching parameters to a specified type `U` - pub fn load<'de, U: serde::Deserialize<'de>>( - &'de self, - ) -> Result { + pub fn load<'de, U: serde::Deserialize<'de>>(&'de self) -> Result { de::Deserialize::deserialize(PathDeserializer::new(self)) } } diff --git a/ntex-router/src/resource.rs b/ntex-router/src/resource.rs index 8af59980..a8009398 100644 --- a/ntex-router/src/resource.rs +++ b/ntex-router/src/resource.rs @@ -346,8 +346,7 @@ impl ResourceDef { loop { let start = if pattern.starts_with('/') { 1 } else { 0 }; - let idx = if let Some(idx) = pattern[start..].find(|c| c == '{' || c == '/') - { + let idx = if let Some(idx) = pattern[start..].find(|c| c == '{' || c == '/') { idx + start } else { break; @@ -551,8 +550,7 @@ mod tests { assert_eq!(tree.find(&mut resource), Some(1)); assert_eq!(resource.get("id").unwrap(), "012345"); - let re = - ResourceDef::new("/u/test/v{version}-no-{minor}xx/resource/{id}/{name}"); + let re = ResourceDef::new("/u/test/v{version}-no-{minor}xx/resource/{id}/{name}"); let tree = Tree::new(&re, 1); let mut resource = Path::new("/u/test/v1-no-3xx/resource/320120/name"); assert_eq!(tree.find(&mut resource), Some(1)); diff --git a/ntex-router/src/router.rs b/ntex-router/src/router.rs index 5e5cc72c..d381889f 100644 --- a/ntex-router/src/router.rs +++ b/ntex-router/src/router.rs @@ -37,10 +37,7 @@ impl Router { } } - pub fn recognize_mut( - &mut self, - resource: &mut R, - ) -> Option<(&mut T, ResourceId)> + pub fn recognize_mut(&mut self, resource: &mut R) -> Option<(&mut T, ResourceId)> where R: Resource

, P: ResourcePath, diff --git a/ntex-router/src/tree.rs b/ntex-router/src/tree.rs index 263f626c..0f15af28 100644 --- a/ntex-router/src/tree.rs +++ b/ntex-router/src/tree.rs @@ -161,11 +161,7 @@ impl Tree { self.find_checked_inner(resource, true, &|_, _| true) } - pub(crate) fn find_checked( - &self, - resource: &mut R, - check: &F, - ) -> Option + pub(crate) fn find_checked(&self, resource: &mut R, check: &F) -> Option where T: ResourcePath, R: Resource, @@ -494,9 +490,7 @@ impl Tree { if let Item::Value(ref val) = val { let v = match val { Value::Val(v) | Value::Prefix(v) => *v, - Value::Slash(_) | Value::PrefixSlash(_) => { - continue - } + Value::Slash(_) | Value::PrefixSlash(_) => continue, }; if check(v, resource) { return Some((v, skip)); @@ -537,16 +531,14 @@ impl Tree { } } Value::Prefix(v) => { - if p == PathState::Slash || p == PathState::Tail - { + if p == PathState::Slash || p == PathState::Tail { *v } else { continue; } } Value::PrefixSlash(v) => { - if p == PathState::Slash || p == PathState::Tail - { + if p == PathState::Slash || p == PathState::Tail { *v } else { continue; diff --git a/ntex-rt/src/arbiter.rs b/ntex-rt/src/arbiter.rs index 90c913c6..7d7ee727 100644 --- a/ntex-rt/src/arbiter.rs +++ b/ntex-rt/src/arbiter.rs @@ -11,8 +11,7 @@ use crate::{system::System, Runtime}; thread_local!( static ADDR: RefCell> = RefCell::new(None); - static STORAGE: RefCell>> = - RefCell::new(HashMap::new()); + static STORAGE: RefCell>> = RefCell::new(HashMap::new()); ); pub(super) static COUNT: AtomicUsize = AtomicUsize::new(0); @@ -173,9 +172,8 @@ impl Arbiter { /// Set item to current arbiter's storage pub fn set_item(item: T) { - STORAGE.with(move |cell| { - cell.borrow_mut().insert(TypeId::of::(), Box::new(item)) - }); + STORAGE + .with(move |cell| cell.borrow_mut().insert(TypeId::of::(), Box::new(item))); } /// Check if arbiter storage contains item @@ -211,9 +209,7 @@ impl Arbiter { let mut st = cell.borrow_mut(); let item = st .get_mut(&TypeId::of::()) - .and_then(|boxed| { - (&mut **boxed as &mut (dyn Any + 'static)).downcast_mut() - }) + .and_then(|boxed| (&mut **boxed as &mut (dyn Any + 'static)).downcast_mut()) .unwrap(); f(item) }) diff --git a/ntex-rt/src/tokio.rs b/ntex-rt/src/tokio.rs index c047ad96..83d3cb03 100644 --- a/ntex-rt/src/tokio.rs +++ b/ntex-rt/src/tokio.rs @@ -77,9 +77,7 @@ pub fn from_tcp_stream(stream: net::TcpStream) -> Result { #[cfg(unix)] /// Convert std UnixStream to tokio's UnixStream -pub fn from_unix_stream( - stream: std::os::unix::net::UnixStream, -) -> Result { +pub fn from_unix_stream(stream: std::os::unix::net::UnixStream) -> Result { stream.set_nonblocking(true)?; Ok(Io::new(tok_io::net::UnixStream::from_std(stream)?)) } diff --git a/ntex-util/src/channel/mpsc.rs b/ntex-util/src/channel/mpsc.rs index 29b0b0c9..c1e1e9b9 100644 --- a/ntex-util/src/channel/mpsc.rs +++ b/ntex-util/src/channel/mpsc.rs @@ -193,10 +193,7 @@ impl Unpin for Receiver {} impl Stream for Receiver { type Item = T; - fn poll_next( - self: Pin<&mut Self>, - cx: &mut Context<'_>, - ) -> Poll> { + fn poll_next(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll> { self.poll_recv(cx) } } diff --git a/ntex-util/src/time/wheel.rs b/ntex-util/src/time/wheel.rs index e5e74a59..c18281bb 100644 --- a/ntex-util/src/time/wheel.rs +++ b/ntex-util/src/time/wheel.rs @@ -660,8 +660,7 @@ mod tests { let _elapsed = Instant::now() - time; #[cfg(not(target_os = "macos"))] assert!( - _elapsed > Duration::from_millis(200) - && _elapsed < Duration::from_millis(300), + _elapsed > Duration::from_millis(200) && _elapsed < Duration::from_millis(300), "elapsed: {:?}", _elapsed ); diff --git a/rustfmt.toml b/rustfmt.toml index 94bd11d5..9bba6dac 100644 --- a/rustfmt.toml +++ b/rustfmt.toml @@ -1,2 +1,2 @@ -max_width = 89 +max_width = 92 reorder_imports = true