mirror of https://github.com/rust-lang/rust.git
Rollup merge of #123083 - klensy:clippy-me, r=workingjubilee
lib: fix some unnecessary_cast clippy lint Fixes few instances of `unnecessary_cast` clippy lint
This commit is contained in:
commit
64a9360d3f
|
@ -354,7 +354,7 @@ impl<'a, K: Ord, V, A: Allocator + Clone> VacantEntry<'a, K, V, A> {
|
||||||
// SAFETY: There is no tree yet so no reference to it exists.
|
// SAFETY: There is no tree yet so no reference to it exists.
|
||||||
let map = unsafe { self.dormant_map.awaken() };
|
let map = unsafe { self.dormant_map.awaken() };
|
||||||
let mut root = NodeRef::new_leaf(self.alloc.clone());
|
let mut root = NodeRef::new_leaf(self.alloc.clone());
|
||||||
let val_ptr = root.borrow_mut().push(self.key, value) as *mut V;
|
let val_ptr = root.borrow_mut().push(self.key, value);
|
||||||
map.root = Some(root.forget_type());
|
map.root = Some(root.forget_type());
|
||||||
map.length = 1;
|
map.length = 1;
|
||||||
val_ptr
|
val_ptr
|
||||||
|
|
|
@ -408,7 +408,7 @@ impl CString {
|
||||||
fn strlen(s: *const c_char) -> usize;
|
fn strlen(s: *const c_char) -> usize;
|
||||||
}
|
}
|
||||||
let len = strlen(ptr) + 1; // Including the NUL byte
|
let len = strlen(ptr) + 1; // Including the NUL byte
|
||||||
let slice = slice::from_raw_parts_mut(ptr, len as usize);
|
let slice = slice::from_raw_parts_mut(ptr, len);
|
||||||
CString { inner: Box::from_raw(slice as *mut [c_char] as *mut [u8]) }
|
CString { inner: Box::from_raw(slice as *mut [c_char] as *mut [u8]) }
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -511,9 +511,9 @@ impl<T> [T] {
|
||||||
while m > 0 {
|
while m > 0 {
|
||||||
// `buf.extend(buf)`:
|
// `buf.extend(buf)`:
|
||||||
unsafe {
|
unsafe {
|
||||||
ptr::copy_nonoverlapping(
|
ptr::copy_nonoverlapping::<T>(
|
||||||
buf.as_ptr(),
|
buf.as_ptr(),
|
||||||
(buf.as_mut_ptr() as *mut T).add(buf.len()),
|
(buf.as_mut_ptr()).add(buf.len()),
|
||||||
buf.len(),
|
buf.len(),
|
||||||
);
|
);
|
||||||
// `buf` has capacity of `self.len() * n`.
|
// `buf` has capacity of `self.len() * n`.
|
||||||
|
@ -532,9 +532,9 @@ impl<T> [T] {
|
||||||
// `buf.extend(buf[0 .. rem_len])`:
|
// `buf.extend(buf[0 .. rem_len])`:
|
||||||
unsafe {
|
unsafe {
|
||||||
// This is non-overlapping since `2^expn > rem`.
|
// This is non-overlapping since `2^expn > rem`.
|
||||||
ptr::copy_nonoverlapping(
|
ptr::copy_nonoverlapping::<T>(
|
||||||
buf.as_ptr(),
|
buf.as_ptr(),
|
||||||
(buf.as_mut_ptr() as *mut T).add(buf.len()),
|
(buf.as_mut_ptr()).add(buf.len()),
|
||||||
rem_len,
|
rem_len,
|
||||||
);
|
);
|
||||||
// `buf.len() + rem_len` equals to `buf.capacity()` (`= self.len() * n`).
|
// `buf.len() + rem_len` equals to `buf.capacity()` (`= self.len() * n`).
|
||||||
|
|
|
@ -148,7 +148,7 @@ fn raw_waker<W: Wake + Send + Sync + 'static>(waker: Arc<W>) -> RawWaker {
|
||||||
unsafe fn clone_waker<W: Wake + Send + Sync + 'static>(waker: *const ()) -> RawWaker {
|
unsafe fn clone_waker<W: Wake + Send + Sync + 'static>(waker: *const ()) -> RawWaker {
|
||||||
unsafe { Arc::increment_strong_count(waker as *const W) };
|
unsafe { Arc::increment_strong_count(waker as *const W) };
|
||||||
RawWaker::new(
|
RawWaker::new(
|
||||||
waker as *const (),
|
waker,
|
||||||
&RawWakerVTable::new(clone_waker::<W>, wake::<W>, wake_by_ref::<W>, drop_waker::<W>),
|
&RawWakerVTable::new(clone_waker::<W>, wake::<W>, wake_by_ref::<W>, drop_waker::<W>),
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
@ -320,7 +320,7 @@ fn local_raw_waker<W: LocalWake + 'static>(waker: Rc<W>) -> RawWaker {
|
||||||
unsafe fn clone_waker<W: LocalWake + 'static>(waker: *const ()) -> RawWaker {
|
unsafe fn clone_waker<W: LocalWake + 'static>(waker: *const ()) -> RawWaker {
|
||||||
unsafe { Rc::increment_strong_count(waker as *const W) };
|
unsafe { Rc::increment_strong_count(waker as *const W) };
|
||||||
RawWaker::new(
|
RawWaker::new(
|
||||||
waker as *const (),
|
waker,
|
||||||
&RawWakerVTable::new(clone_waker::<W>, wake::<W>, wake_by_ref::<W>, drop_waker::<W>),
|
&RawWakerVTable::new(clone_waker::<W>, wake::<W>, wake_by_ref::<W>, drop_waker::<W>),
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
|
@ -107,13 +107,13 @@ where
|
||||||
pub fn sockaddr_to_addr(storage: &c::sockaddr_storage, len: usize) -> io::Result<SocketAddr> {
|
pub fn sockaddr_to_addr(storage: &c::sockaddr_storage, len: usize) -> io::Result<SocketAddr> {
|
||||||
match storage.ss_family as c_int {
|
match storage.ss_family as c_int {
|
||||||
c::AF_INET => {
|
c::AF_INET => {
|
||||||
assert!(len as usize >= mem::size_of::<c::sockaddr_in>());
|
assert!(len >= mem::size_of::<c::sockaddr_in>());
|
||||||
Ok(SocketAddr::V4(FromInner::from_inner(unsafe {
|
Ok(SocketAddr::V4(FromInner::from_inner(unsafe {
|
||||||
*(storage as *const _ as *const c::sockaddr_in)
|
*(storage as *const _ as *const c::sockaddr_in)
|
||||||
})))
|
})))
|
||||||
}
|
}
|
||||||
c::AF_INET6 => {
|
c::AF_INET6 => {
|
||||||
assert!(len as usize >= mem::size_of::<c::sockaddr_in6>());
|
assert!(len >= mem::size_of::<c::sockaddr_in6>());
|
||||||
Ok(SocketAddr::V6(FromInner::from_inner(unsafe {
|
Ok(SocketAddr::V6(FromInner::from_inner(unsafe {
|
||||||
*(storage as *const _ as *const c::sockaddr_in6)
|
*(storage as *const _ as *const c::sockaddr_in6)
|
||||||
})))
|
})))
|
||||||
|
|
Loading…
Reference in New Issue