aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorGravatar Rob Ede <robjtede@icloud.com> 2022-01-24 08:58:05 +0000
committerGravatar GitHub <noreply@github.com> 2022-01-24 09:58:05 +0100
commit0e3b2466f199375031006857164fbf70e3ea479f (patch)
treedb22384c238a578fde1c7f4572338fa7744b6876 /src
parent68afb40df9ea2e61a93d0e26f6f8a9f231979452 (diff)
downloadbytes-0e3b2466f199375031006857164fbf70e3ea479f.tar.gz
bytes-0e3b2466f199375031006857164fbf70e3ea479f.tar.zst
bytes-0e3b2466f199375031006857164fbf70e3ea479f.zip
Address various clippy warnings (#528)
Diffstat (limited to 'src')
-rw-r--r--src/bytes.rs10
-rw-r--r--src/bytes_mut.rs22
-rw-r--r--src/fmt/debug.rs6
3 files changed, 19 insertions, 19 deletions
diff --git a/src/bytes.rs b/src/bytes.rs
index c4fbd4a..f3e4c5c 100644
--- a/src/bytes.rs
+++ b/src/bytes.rs
@@ -262,7 +262,7 @@ impl Bytes {
let mut ret = self.clone();
ret.len = end - begin;
- ret.ptr = unsafe { ret.ptr.offset(begin as isize) };
+ ret.ptr = unsafe { ret.ptr.add(begin) };
ret
}
@@ -501,7 +501,7 @@ impl Bytes {
// should already be asserted, but debug assert for tests
debug_assert!(self.len >= by, "internal: inc_start out of bounds");
self.len -= by;
- self.ptr = self.ptr.offset(by as isize);
+ self.ptr = self.ptr.add(by);
}
}
@@ -604,7 +604,7 @@ impl<'a> IntoIterator for &'a Bytes {
type IntoIter = core::slice::Iter<'a, u8>;
fn into_iter(self) -> Self::IntoIter {
- self.as_slice().into_iter()
+ self.as_slice().iter()
}
}
@@ -686,7 +686,7 @@ impl PartialOrd<Bytes> for str {
impl PartialEq<Vec<u8>> for Bytes {
fn eq(&self, other: &Vec<u8>) -> bool {
- *self == &other[..]
+ *self == other[..]
}
}
@@ -710,7 +710,7 @@ impl PartialOrd<Bytes> for Vec<u8> {
impl PartialEq<String> for Bytes {
fn eq(&self, other: &String) -> bool {
- *self == &other[..]
+ *self == other[..]
}
}
diff --git a/src/bytes_mut.rs b/src/bytes_mut.rs
index f39b73e..970ed95 100644
--- a/src/bytes_mut.rs
+++ b/src/bytes_mut.rs
@@ -603,7 +603,7 @@ impl BytesMut {
v.reserve(additional);
// Update the info
- self.ptr = vptr(v.as_mut_ptr().offset(off as isize));
+ self.ptr = vptr(v.as_mut_ptr().add(off));
self.len = v.len() - off;
self.cap = v.capacity() - off;
}
@@ -818,7 +818,7 @@ impl BytesMut {
// Updating the start of the view is setting `ptr` to point to the
// new start and updating the `len` field to reflect the new length
// of the view.
- self.ptr = vptr(self.ptr.as_ptr().offset(start as isize));
+ self.ptr = vptr(self.ptr.as_ptr().add(start));
if self.len >= start {
self.len -= start;
@@ -842,7 +842,7 @@ impl BytesMut {
return Ok(());
}
- let ptr = unsafe { self.ptr.as_ptr().offset(self.len as isize) };
+ let ptr = unsafe { self.ptr.as_ptr().add(self.len) };
if ptr == other.ptr.as_ptr()
&& self.kind() == KIND_ARC
&& other.kind() == KIND_ARC
@@ -931,7 +931,7 @@ impl BytesMut {
#[inline]
fn uninit_slice(&mut self) -> &mut UninitSlice {
unsafe {
- let ptr = self.ptr.as_ptr().offset(self.len as isize);
+ let ptr = self.ptr.as_ptr().add(self.len);
let len = self.cap - self.len;
UninitSlice::from_raw_parts_mut(ptr, len)
@@ -1178,7 +1178,7 @@ impl<'a> IntoIterator for &'a BytesMut {
type IntoIter = core::slice::Iter<'a, u8>;
fn into_iter(self) -> Self::IntoIter {
- self.as_ref().into_iter()
+ self.as_ref().iter()
}
}
@@ -1207,7 +1207,7 @@ impl<'a> Extend<&'a u8> for BytesMut {
where
T: IntoIterator<Item = &'a u8>,
{
- self.extend(iter.into_iter().map(|b| *b))
+ self.extend(iter.into_iter().copied())
}
}
@@ -1219,7 +1219,7 @@ impl FromIterator<u8> for BytesMut {
impl<'a> FromIterator<&'a u8> for BytesMut {
fn from_iter<T: IntoIterator<Item = &'a u8>>(into_iter: T) -> Self {
- BytesMut::from_iter(into_iter.into_iter().map(|b| *b))
+ BytesMut::from_iter(into_iter.into_iter().copied())
}
}
@@ -1409,7 +1409,7 @@ impl PartialOrd<BytesMut> for str {
impl PartialEq<Vec<u8>> for BytesMut {
fn eq(&self, other: &Vec<u8>) -> bool {
- *self == &other[..]
+ *self == other[..]
}
}
@@ -1433,7 +1433,7 @@ impl PartialOrd<BytesMut> for Vec<u8> {
impl PartialEq<String> for BytesMut {
fn eq(&self, other: &String) -> bool {
- *self == &other[..]
+ *self == other[..]
}
}
@@ -1499,13 +1499,13 @@ impl PartialOrd<BytesMut> for &str {
impl PartialEq<BytesMut> for Bytes {
fn eq(&self, other: &BytesMut) -> bool {
- &other[..] == &self[..]
+ other[..] == self[..]
}
}
impl PartialEq<Bytes> for BytesMut {
fn eq(&self, other: &Bytes) -> bool {
- &other[..] == &self[..]
+ other[..] == self[..]
}
}
diff --git a/src/fmt/debug.rs b/src/fmt/debug.rs
index a854551..83de695 100644
--- a/src/fmt/debug.rs
+++ b/src/fmt/debug.rs
@@ -25,7 +25,7 @@ impl Debug for BytesRef<'_> {
} else if b == b'\0' {
write!(f, "\\0")?;
// ASCII printable
- } else if b >= 0x20 && b < 0x7f {
+ } else if (0x20..0x7f).contains(&b) {
write!(f, "{}", b as char)?;
} else {
write!(f, "\\x{:02x}", b)?;
@@ -38,12 +38,12 @@ impl Debug for BytesRef<'_> {
impl Debug for Bytes {
fn fmt(&self, f: &mut Formatter<'_>) -> Result {
- Debug::fmt(&BytesRef(&self.as_ref()), f)
+ Debug::fmt(&BytesRef(self.as_ref()), f)
}
}
impl Debug for BytesMut {
fn fmt(&self, f: &mut Formatter<'_>) -> Result {
- Debug::fmt(&BytesRef(&self.as_ref()), f)
+ Debug::fmt(&BytesRef(self.as_ref()), f)
}
}