diff options
author | 2019-08-27 23:19:44 +0200 | |
---|---|---|
committer | 2019-08-27 14:19:44 -0700 | |
commit | 4f5ed82b3c3712bcde294307b91ff61744bedddc (patch) | |
tree | 2036d141feaad1bb57de8da53a701075a4334a0c | |
parent | ae9991f3ba4f08d9c3d57b240a3c018082a38012 (diff) | |
download | bytes-4f5ed82b3c3712bcde294307b91ff61744bedddc.tar.gz bytes-4f5ed82b3c3712bcde294307b91ff61744bedddc.tar.zst bytes-4f5ed82b3c3712bcde294307b91ff61744bedddc.zip |
Fix clippy (#285)
-rw-r--r-- | src/buf/buf_impl.rs (renamed from src/buf/buf.rs) | 0 | ||||
-rw-r--r-- | src/buf/chain.rs | 4 | ||||
-rw-r--r-- | src/buf/iter.rs | 2 | ||||
-rw-r--r-- | src/buf/mod.rs | 4 | ||||
-rw-r--r-- | src/buf/reader.rs | 2 | ||||
-rw-r--r-- | src/buf/take.rs | 4 | ||||
-rw-r--r-- | src/buf/writer.rs | 2 | ||||
-rw-r--r-- | src/bytes.rs | 18 |
8 files changed, 18 insertions, 18 deletions
diff --git a/src/buf/buf.rs b/src/buf/buf_impl.rs index e126bb4..e126bb4 100644 --- a/src/buf/buf.rs +++ b/src/buf/buf_impl.rs diff --git a/src/buf/chain.rs b/src/buf/chain.rs index 83ece63..7d03d36 100644 --- a/src/buf/chain.rs +++ b/src/buf/chain.rs @@ -50,8 +50,8 @@ impl<T, U> Chain<T, U> { /// ``` pub fn new(a: T, b: U) -> Chain<T, U> { Chain { - a: a, - b: b, + a, + b, } } diff --git a/src/buf/iter.rs b/src/buf/iter.rs index a93e359..1af421a 100644 --- a/src/buf/iter.rs +++ b/src/buf/iter.rs @@ -45,7 +45,7 @@ impl<T> IntoIter<T> { /// assert_eq!(iter.next(), None); /// ``` pub fn new(inner: T) -> IntoIter<T> { - IntoIter { inner: inner } + IntoIter { inner } } /// Consumes this `IntoIter`, returning the underlying value. /// diff --git a/src/buf/mod.rs b/src/buf/mod.rs index 81e22d3..cd7373e 100644 --- a/src/buf/mod.rs +++ b/src/buf/mod.rs @@ -16,7 +16,7 @@ //! [`Buf`]: trait.Buf.html //! [`BufMut`]: trait.BufMut.html -mod buf; +mod buf_impl; mod buf_mut; mod chain; mod iter; @@ -25,7 +25,7 @@ mod take; mod vec_deque; mod writer; -pub use self::buf::Buf; +pub use self::buf_impl::Buf; pub use self::buf_mut::BufMut; pub use self::chain::Chain; pub use self::iter::IntoIter; diff --git a/src/buf/reader.rs b/src/buf/reader.rs index 361fdf7..06ee1a6 100644 --- a/src/buf/reader.rs +++ b/src/buf/reader.rs @@ -13,7 +13,7 @@ pub struct Reader<B> { } pub fn new<B>(buf: B) -> Reader<B> { - Reader { buf: buf } + Reader { buf } } impl<B: Buf> Reader<B> { diff --git a/src/buf/take.rs b/src/buf/take.rs index 559640b..d4b1881 100644 --- a/src/buf/take.rs +++ b/src/buf/take.rs @@ -14,8 +14,8 @@ pub struct Take<T> { pub fn new<T>(inner: T, limit: usize) -> Take<T> { Take { - inner: inner, - limit: limit, + inner, + limit, } } diff --git a/src/buf/writer.rs b/src/buf/writer.rs index c946234..8b35707 100644 --- a/src/buf/writer.rs +++ b/src/buf/writer.rs @@ -13,7 +13,7 @@ pub struct Writer<B> { } pub fn new<B>(buf: B) -> Writer<B> { - Writer { buf: buf } + Writer { buf } } impl<B: BufMut> Writer<B> { diff --git a/src/bytes.rs b/src/bytes.rs index 6a9c959..b962649 100644 --- a/src/bytes.rs +++ b/src/bytes.rs @@ -357,7 +357,7 @@ const MAX_VEC_POS: usize = usize::MAX >> VEC_POS_OFFSET; const NOT_VEC_POS_MASK: usize = 0b11111; // Bit op constants for extracting the inline length value from the `arc` field. -const INLINE_LEN_MASK: usize = 0b11111100; +const INLINE_LEN_MASK: usize = 0b1111_1100; const INLINE_LEN_OFFSET: usize = 2; // Byte offset from the start of `Inner` to where the inline buffer data @@ -1671,7 +1671,7 @@ impl<'a> From<&'a [u8]> for BytesMut { inner.as_raw()[0..len].copy_from_slice(src); BytesMut { - inner: inner, + inner, } } } else { @@ -1825,7 +1825,7 @@ impl Inner { // track the fact that the `Bytes` handle is backed by a // static buffer. arc: AtomicPtr::new(KIND_STATIC as *mut Shared), - ptr: ptr, + ptr, len: bytes.len(), cap: bytes.len(), } @@ -1844,9 +1844,9 @@ impl Inner { Inner { arc: AtomicPtr::new(arc as *mut Shared), - ptr: ptr, - len: len, - cap: cap, + ptr, + len, + cap, } } @@ -1987,7 +1987,7 @@ impl Inner { self.set_end(at); } - return other + other } fn split_to(&mut self, at: usize) -> Inner { @@ -1998,7 +1998,7 @@ impl Inner { self.set_start(at); } - return other + other } fn truncate(&mut self, len: usize) { @@ -2246,7 +2246,7 @@ impl Inner { // vector. let shared = Box::new(Shared { vec: rebuild_vec(self.ptr, self.len, self.cap, off), - original_capacity_repr: original_capacity_repr, + original_capacity_repr, // Initialize refcount to 2. One for this reference, and one // for the new clone that will be returned from // `shallow_clone`. |