diff options
| author | bors <bors@rust-lang.org> | 2018-07-20 22:52:11 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2018-07-20 22:52:11 +0000 |
| commit | ee8d23d54445f8d3e62a5e2bd6fde9ac3ff2cf24 (patch) | |
| tree | 5b1993b8da7f303046ad60ce690ca657cb34bced /src/libcore | |
| parent | 878dd0b5e19e086e608351f33bf12e3625425f20 (diff) | |
| parent | 7bf3578a39e71d61a22beaa121ebd25de2b25738 (diff) | |
| download | rust-ee8d23d54445f8d3e62a5e2bd6fde9ac3ff2cf24.tar.gz rust-ee8d23d54445f8d3e62a5e2bd6fde9ac3ff2cf24.zip | |
Auto merge of #52574 - kennytm:rollup, r=kennytm
Rollup of 7 pull requests Successful merges: - #52502 (fix unsafety: don't call ptr_rotate for ZST) - #52505 (rustc: Remove a workaround in ThinLTO fixed upstream) - #52526 (Enable run-pass/sepcomp-lib-lto.rs on Android) - #52527 (Remove duplicate E0396 tests) - #52539 (rustc: Fix two custom attributes with custom derive) - #52540 (Fix docker/run.sh script when run locally) - #52573 (Cleanups) Failed merges: r? @ghost
Diffstat (limited to 'src/libcore')
| -rw-r--r-- | src/libcore/slice/rotate.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libcore/slice/rotate.rs b/src/libcore/slice/rotate.rs index e4a4e33c172..28ef53ccb5c 100644 --- a/src/libcore/slice/rotate.rs +++ b/src/libcore/slice/rotate.rs @@ -48,7 +48,6 @@ impl<T> RawArray<T> { /// # Safety /// /// The specified range must be valid for reading and writing. -/// The type `T` must have non-zero size. /// /// # Algorithm /// @@ -73,6 +72,7 @@ pub unsafe fn ptr_rotate<T>(mut left: usize, mid: *mut T, mut right: usize) { loop { let delta = cmp::min(left, right); if delta <= RawArray::<T>::cap() { + // We will always hit this immediately for ZST. break; } |