From 19cc8ab31594bbcdac44d642685523957d124ba3 Mon Sep 17 00:00:00 2001 From: Nikolay Kim Date: Tue, 5 Sep 2023 15:49:49 +0600 Subject: [PATCH] Clippy --- ntex-bytes/src/buf/buf_mut.rs | 8 ++------ ntex-bytes/src/bytes.rs | 12 ++---------- ntex-io/src/testing.rs | 18 ++++++++++-------- ntex-service/src/ctx.rs | 6 +----- ntex-util/src/services/extensions.rs | 2 +- ntex/src/http/client/mod.rs | 2 +- ntex/src/http/encoding/mod.rs | 2 +- ntex/src/http/h1/encoder.rs | 6 +++--- ntex/src/server/mod.rs | 2 +- 9 files changed, 22 insertions(+), 36 deletions(-) diff --git a/ntex-bytes/src/buf/buf_mut.rs b/ntex-bytes/src/buf/buf_mut.rs index d4bcffeb..7bbb5076 100644 --- a/ntex-bytes/src/buf/buf_mut.rs +++ b/ntex-bytes/src/buf/buf_mut.rs @@ -187,7 +187,7 @@ pub trait BufMut { let d = self.chunk_mut(); l = cmp::min(s.len(), d.len()); - ptr::copy_nonoverlapping(s.as_ptr(), d.as_mut_ptr() as *mut u8, l); + ptr::copy_nonoverlapping(s.as_ptr(), d.as_mut_ptr(), l); } src.advance(l); @@ -228,11 +228,7 @@ pub trait BufMut { let dst = self.chunk_mut(); cnt = cmp::min(dst.len(), src.len() - off); - ptr::copy_nonoverlapping( - src[off..].as_ptr(), - dst.as_mut_ptr() as *mut u8, - cnt, - ); + ptr::copy_nonoverlapping(src[off..].as_ptr(), dst.as_mut_ptr(), cnt); off += cnt; } diff --git a/ntex-bytes/src/bytes.rs b/ntex-bytes/src/bytes.rs index 9f23737b..c69a1156 100644 --- a/ntex-bytes/src/bytes.rs +++ b/ntex-bytes/src/bytes.rs @@ -1607,11 +1607,7 @@ impl BufMut for BytesMut { self.reserve(len); unsafe { - ptr::copy_nonoverlapping( - src.as_ptr(), - self.chunk_mut().as_mut_ptr() as *mut u8, - len, - ); + ptr::copy_nonoverlapping(src.as_ptr(), self.chunk_mut().as_mut_ptr(), len); self.advance_mut(len); } } @@ -2418,11 +2414,7 @@ impl BufMut for BytesVec { self.reserve(len); unsafe { - ptr::copy_nonoverlapping( - src.as_ptr(), - self.chunk_mut().as_mut_ptr() as *mut u8, - len, - ); + ptr::copy_nonoverlapping(src.as_ptr(), self.chunk_mut().as_mut_ptr(), len); self.advance_mut(len); } } diff --git a/ntex-io/src/testing.rs b/ntex-io/src/testing.rs index d2885454..3ad86f1f 100644 --- a/ntex-io/src/testing.rs +++ b/ntex-io/src/testing.rs @@ -1,8 +1,7 @@ //! utilities and helpers for testing -use std::cell::{Cell, RefCell}; use std::sync::{Arc, Mutex}; use std::task::{ready, Context, Poll, Waker}; -use std::{any, cmp, fmt, future::Future, io, mem, net, pin::Pin, rc::Rc}; +use std::{any, cell::RefCell, cmp, fmt, future::Future, io, mem, net, pin::Pin, rc::Rc}; use ntex_bytes::{Buf, BufMut, Bytes, BytesVec}; use ntex_util::future::poll_fn; @@ -32,7 +31,7 @@ impl fmt::Debug for AtomicWaker { pub struct IoTest { tp: Type, peer_addr: Option, - state: Arc>, + state: Arc>>, local: Arc>>, remote: Arc>>, } @@ -68,6 +67,9 @@ struct Channel { write: IoTestState, } +unsafe impl Sync for Channel {} +unsafe impl Send for Channel {} + impl Channel { fn is_closed(&self) -> bool { self.flags.contains(IoTestFlags::CLOSED) @@ -94,7 +96,7 @@ impl IoTest { pub fn create() -> (IoTest, IoTest) { let local = Arc::new(Mutex::new(RefCell::new(Channel::default()))); let remote = Arc::new(Mutex::new(RefCell::new(Channel::default()))); - let state = Arc::new(Cell::new(State::default())); + let state = Arc::new(Mutex::new(RefCell::new(State::default()))); ( IoTest { @@ -115,11 +117,11 @@ impl IoTest { } pub fn is_client_dropped(&self) -> bool { - self.state.get().client_dropped + self.state.lock().unwrap().borrow().client_dropped } pub fn is_server_dropped(&self) -> bool { - self.state.get().server_dropped + self.state.lock().unwrap().borrow().server_dropped } /// Check if channel is closed from remoote side @@ -332,13 +334,13 @@ impl Clone for IoTest { impl Drop for IoTest { fn drop(&mut self) { - let mut state = self.state.get(); + let mut state = *self.state.lock().unwrap().borrow(); match self.tp { Type::Server => state.server_dropped = true, Type::Client => state.client_dropped = true, _ => (), } - self.state.set(state); + *self.state.lock().unwrap().borrow_mut() = state; let guard = self.remote.lock().unwrap(); let mut remote = guard.borrow_mut(); diff --git a/ntex-service/src/ctx.rs b/ntex-service/src/ctx.rs index fcc007aa..78b52f2e 100644 --- a/ntex-service/src/ctx.rs +++ b/ntex-service/src/ctx.rs @@ -144,11 +144,7 @@ impl<'a, S> Copy for ServiceCtx<'a, S> {} impl<'a, S> Clone for ServiceCtx<'a, S> { #[inline] fn clone(&self) -> Self { - Self { - idx: self.idx, - waiters: self.waiters, - _t: marker::PhantomData, - } + *self } } diff --git a/ntex-util/src/services/extensions.rs b/ntex-util/src/services/extensions.rs index 0d41bf8b..57ba572d 100644 --- a/ntex-util/src/services/extensions.rs +++ b/ntex-util/src/services/extensions.rs @@ -53,7 +53,7 @@ impl Extensions { /// Add all items from other `Extensions` pub fn extend(&mut self, other: Extensions) { - self.map.extend(other.map.into_iter()); + self.map.extend(other.map); } #[inline] diff --git a/ntex/src/http/client/mod.rs b/ntex/src/http/client/mod.rs index 6b007826..89e9d947 100644 --- a/ntex/src/http/client/mod.rs +++ b/ntex/src/http/client/mod.rs @@ -73,7 +73,7 @@ pub struct Connect { #[derive(Clone)] pub struct Client(Rc); -pub(self) struct ClientConfig { +struct ClientConfig { pub(self) connector: Box, pub(self) headers: HeaderMap, pub(self) timeout: Millis, diff --git a/ntex/src/http/encoding/mod.rs b/ntex/src/http/encoding/mod.rs index 9edfa3e5..3b6eebd2 100644 --- a/ntex/src/http/encoding/mod.rs +++ b/ntex/src/http/encoding/mod.rs @@ -9,7 +9,7 @@ mod encoder; pub use self::decoder::Decoder; pub use self::encoder::Encoder; -pub(self) struct Writer { +struct Writer { buf: BytesMut, } diff --git a/ntex/src/http/h1/encoder.rs b/ntex/src/http/h1/encoder.rs index 1e461241..a4f1c0a2 100644 --- a/ntex/src/http/h1/encoder.rs +++ b/ntex/src/http/h1/encoder.rs @@ -114,7 +114,7 @@ pub(super) trait MessageType: Sized { let mut pos = 0; let mut has_date = false; let mut remaining = dst.capacity() - dst.len(); - let mut buf = dst.chunk_mut().as_mut_ptr() as *mut u8; + let mut buf = dst.chunk_mut().as_mut_ptr(); for (key, value) in headers { match *key { CONNECTION => continue, @@ -138,7 +138,7 @@ pub(super) trait MessageType: Sized { pos = 0; dst.reserve(len * 2); remaining = dst.capacity() - dst.len(); - buf = dst.chunk_mut().as_mut_ptr() as *mut u8; + buf = dst.chunk_mut().as_mut_ptr(); } copy_nonoverlapping(k.as_ptr(), buf, k_len); buf = buf.add(k_len); @@ -165,7 +165,7 @@ pub(super) trait MessageType: Sized { pos = 0; dst.reserve(len * 2); remaining = dst.capacity() - dst.len(); - buf = dst.chunk_mut().as_mut_ptr() as *mut u8; + buf = dst.chunk_mut().as_mut_ptr(); } copy_nonoverlapping(k.as_ptr(), buf, k_len); buf = buf.add(k_len); diff --git a/ntex/src/server/mod.rs b/ntex/src/server/mod.rs index 87432802..def80e03 100644 --- a/ntex/src/server/mod.rs +++ b/ntex/src/server/mod.rs @@ -37,7 +37,7 @@ pub enum ServerStatus { /// Socket id token #[derive(Clone, Copy, Debug, PartialEq, Eq, Hash)] -pub(self) struct Token(usize); +struct Token(usize); impl Token { pub(self) fn next(&mut self) -> Token {