diff options
| author | Simon Sapin <simon.sapin@exyr.org> | 2018-05-30 21:04:17 +0200 |
|---|---|---|
| committer | Simon Sapin <simon.sapin@exyr.org> | 2018-06-11 13:47:28 -0700 |
| commit | 0081d8826b00f4eaf217d4d68d54e715bd98dcb9 (patch) | |
| tree | 4f17151ee8563a6c97d741605bb3be7022ba5ed8 | |
| parent | 11f992c9584f05f56664627ac1ec42e4cd1f0e3e (diff) | |
| download | rust-0081d8826b00f4eaf217d4d68d54e715bd98dcb9.tar.gz rust-0081d8826b00f4eaf217d4d68d54e715bd98dcb9.zip | |
Remove some unneeded casts
| -rw-r--r-- | src/liballoc/raw_vec.rs | 6 | ||||
| -rw-r--r-- | src/test/run-pass/realloc-16687.rs | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/liballoc/raw_vec.rs b/src/liballoc/raw_vec.rs index c09f21eeb92..d1f140e96a3 100644 --- a/src/liballoc/raw_vec.rs +++ b/src/liballoc/raw_vec.rs @@ -93,7 +93,7 @@ impl<T, A: Alloc> RawVec<T, A> { // handles ZSTs and `cap = 0` alike let ptr = if alloc_size == 0 { - NonNull::<T>::dangling().cast() + NonNull::<T>::dangling() } else { let align = mem::align_of::<T>(); let layout = Layout::from_size_align(alloc_size, align).unwrap(); @@ -103,13 +103,13 @@ impl<T, A: Alloc> RawVec<T, A> { a.alloc(layout) }; match result { - Ok(ptr) => ptr, + Ok(ptr) => ptr.cast(), Err(_) => oom(layout), } }; RawVec { - ptr: ptr.cast().into(), + ptr: ptr.into(), cap, a, } diff --git a/src/test/run-pass/realloc-16687.rs b/src/test/run-pass/realloc-16687.rs index 355053858cc..7152e721eac 100644 --- a/src/test/run-pass/realloc-16687.rs +++ b/src/test/run-pass/realloc-16687.rs @@ -64,7 +64,7 @@ unsafe fn test_triangle() -> bool { println!("deallocate({:?}, {:?}", ptr, layout); } - Global.dealloc(NonNull::new_unchecked(ptr).cast(), layout); + Global.dealloc(NonNull::new_unchecked(ptr), layout); } unsafe fn reallocate(ptr: *mut u8, old: Layout, new: Layout) -> *mut u8 { @@ -72,7 +72,7 @@ unsafe fn test_triangle() -> bool { println!("reallocate({:?}, old={:?}, new={:?})", ptr, old, new); } - let ret = Global.realloc(NonNull::new_unchecked(ptr).cast(), old, new.size()) + let ret = Global.realloc(NonNull::new_unchecked(ptr), old, new.size()) .unwrap_or_else(|_| oom(Layout::from_size_align_unchecked(new.size(), old.align()))); if PRINT { |