diff options
| author | bors <bors@rust-lang.org> | 2017-12-25 04:55:57 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2017-12-25 04:55:57 +0000 |
| commit | a6fc84440f3353b1090dc52d7859136880db89ec (patch) | |
| tree | ae9034dfdbd3fa7ad9b228758573a9d5b1f2b584 /src/librustc_data_structures | |
| parent | ae65dcc30f421fd91b9e2d67cf77c86bfb20ee3a (diff) | |
| parent | 60e66290451644e81323daa7cf03c337a6569c83 (diff) | |
| download | rust-a6fc84440f3353b1090dc52d7859136880db89ec.tar.gz rust-a6fc84440f3353b1090dc52d7859136880db89ec.zip | |
Auto merge of #46914 - mikeyhew:raw_pointer_self, r=arielb1
Convert warning about `*const _` to a future-compat lint #46664 was merged before I could convert the soft warning about method lookup on `*const _` into a future-compatibility lint. This PR makes that change. fixes #46837 tracking issue for the future-compatibility lint: #46906 r? @arielb1
Diffstat (limited to 'src/librustc_data_structures')
| -rw-r--r-- | src/librustc_data_structures/array_vec.rs | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/librustc_data_structures/array_vec.rs b/src/librustc_data_structures/array_vec.rs index 1b39e029604..57fc78ef531 100644 --- a/src/librustc_data_structures/array_vec.rs +++ b/src/librustc_data_structures/array_vec.rs @@ -138,7 +138,7 @@ impl<A: Array> ArrayVec<A> { // Use the borrow in the IterMut to indicate borrowing behavior of the // whole Drain iterator (like &mut T). let range_slice = { - let arr = &mut self.values as &mut [ManuallyDrop<_>]; + let arr = &mut self.values as &mut [ManuallyDrop<<A as Array>::Element>]; slice::from_raw_parts_mut(arr.as_mut_ptr().offset(start as isize), end - start) }; @@ -255,12 +255,13 @@ impl<'a, A: Array> Drop for Drain<'a, A> { if self.tail_len > 0 { unsafe { - let source_array_vec = self.array_vec.as_mut(); + let source_array_vec: &mut ArrayVec<A> = self.array_vec.as_mut(); // memmove back untouched tail, update to new length let start = source_array_vec.len(); let tail = self.tail_start; { - let arr = &mut source_array_vec.values as &mut [ManuallyDrop<_>]; + let arr = + &mut source_array_vec.values as &mut [ManuallyDrop<<A as Array>::Element>]; let src = arr.as_ptr().offset(tail as isize); let dst = arr.as_mut_ptr().offset(start as isize); ptr::copy(src, dst, self.tail_len); |
