Commit 64a9360

authored

Rollup merge of rust-lang#123083 - klensy:clippy-me, r=workingjubilee

lib: fix some unnecessary_cast clippy lint Fixes few instances of `unnecessary_cast` clippy lint

2 parents dc4236d + 8560d01 commit 64a9360Copy full SHA for 64a9360

File tree

+10

-10

lines changed

+10

-10

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -354,7 +354,7 @@ impl<'a, K: Ord, V, A: Allocator + Clone> VacantEntry<'a, K, V, A> {`
`354`	`354`	`// SAFETY: There is no tree yet so no reference to it exists.`
`355`	`355`	`let map = unsafe { self.dormant_map.awaken() };`
`356`	`356`	`let mut root = NodeRef::new_leaf(self.alloc.clone());`
`357`		`- let val_ptr = root.borrow_mut().push(self.key, value)as*mutV;`
	`357`	`+ let val_ptr = root.borrow_mut().push(self.key, value);`
`358`	`358`	`map.root = Some(root.forget_type());`
`359`	`359`	`map.length = 1;`
`360`	`360`	`val_ptr`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -408,7 +408,7 @@ impl CString {`
`408`	`408`	`fn strlen(s: *const c_char) -> usize;`
`409`	`409`	`}`
`410`	`410`	`let len = strlen(ptr) + 1; // Including the NUL byte`
`411`		`- let slice = slice::from_raw_parts_mut(ptr, lenasusize);`
	`411`	`+ let slice = slice::from_raw_parts_mut(ptr, len);`
`412`	`412`	`CString { inner: Box::from_raw(slice as mut [c_char] as mut [u8]) }`
`413`	`413`	`}`
`414`	`414`	`}`

Lines changed: 4 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -511,9 +511,9 @@ impl<T> [T] {`
`511`	`511`	`while m > 0 {`
`512`	`512`	// `buf.extend(buf)`:
`513`	`513`	`unsafe {`
`514`		`- ptr::copy_nonoverlapping(`
	`514`	`+ ptr::copy_nonoverlapping::<T>(`
`515`	`515`	`buf.as_ptr(),`
`516`		`- (buf.as_mut_ptr()as*mutT).add(buf.len()),`
	`516`	`+ (buf.as_mut_ptr()).add(buf.len()),`
`517`	`517`	`buf.len(),`
`518`	`518`	`);`
`519`	`519`	// `buf` has capacity of `self.len() * n`.
`@@ -532,9 +532,9 @@ impl<T> [T] {`
`532`	`532`	// `buf.extend(buf[0 .. rem_len])`:
`533`	`533`	`unsafe {`
`534`	`534`	// This is non-overlapping since `2^expn > rem`.
`535`		`- ptr::copy_nonoverlapping(`
	`535`	`+ ptr::copy_nonoverlapping::<T>(`
`536`	`536`	`buf.as_ptr(),`
`537`		`- (buf.as_mut_ptr()as*mutT).add(buf.len()),`
	`537`	`+ (buf.as_mut_ptr()).add(buf.len()),`
`538`	`538`	`rem_len,`
`539`	`539`	`);`
`540`	`540`	// `buf.len() + rem_len` equals to `buf.capacity()` (`= self.len() * n`).

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -148,7 +148,7 @@ fn raw_waker<W: Wake + Send + Sync + 'static>(waker: Arc<W>) -> RawWaker {`
`148`	`148`	`unsafe fn clone_waker<W: Wake + Send + Sync + 'static>(waker: *const ()) -> RawWaker {`
`149`	`149`	`unsafe { Arc::increment_strong_count(waker as *const W) };`
`150`	`150`	`RawWaker::new(`
`151`		`- wakeras*const(),`
	`151`	`+ waker,`
`152`	`152`	`&RawWakerVTable::new(clone_waker::<W>, wake::<W>, wake_by_ref::<W>, drop_waker::<W>),`
`153`	`153`	`)`
`154`	`154`	`}`
`@@ -320,7 +320,7 @@ fn local_raw_waker<W: LocalWake + 'static>(waker: Rc<W>) -> RawWaker {`
`320`	`320`	`unsafe fn clone_waker<W: LocalWake + 'static>(waker: *const ()) -> RawWaker {`
`321`	`321`	`unsafe { Rc::increment_strong_count(waker as *const W) };`
`322`	`322`	`RawWaker::new(`
`323`		`- wakeras*const(),`
	`323`	`+ waker,`
`324`	`324`	`&RawWakerVTable::new(clone_waker::<W>, wake::<W>, wake_by_ref::<W>, drop_waker::<W>),`
`325`	`325`	`)`
`326`	`326`	`}`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -107,13 +107,13 @@ where`
`107`	`107`	`pub fn sockaddr_to_addr(storage: &c::sockaddr_storage, len: usize) -> io::Result<SocketAddr> {`
`108`	`108`	`match storage.ss_family as c_int {`
`109`	`109`	`c::AF_INET => {`
`110`		`- assert!(len asusize>= mem::size_of::<c::sockaddr_in>());`
	`110`	`+ assert!(len >= mem::size_of::<c::sockaddr_in>());`
`111`	`111`	`Ok(SocketAddr::V4(FromInner::from_inner(unsafe {`
`112`	`112`	`(storage as const _ as *const c::sockaddr_in)`
`113`	`113`	`})))`
`114`	`114`	`}`
`115`	`115`	`c::AF_INET6 => {`
`116`		`- assert!(len asusize>= mem::size_of::<c::sockaddr_in6>());`
	`116`	`+ assert!(len >= mem::size_of::<c::sockaddr_in6>());`
`117`	`117`	`Ok(SocketAddr::V6(FromInner::from_inner(unsafe {`
`118`	`118`	`(storage as const _ as *const c::sockaddr_in6)`
`119`	`119`	`})))`

Comments

(0)