mathieu/os-rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

don't duplicate slice panic_bounds_check

Browse source
This commit is contained in:
Ibraheem Ahmed 2021-10-14 09:31:34 -04:00 • committed by GitHub
parent c517a0de3e
commit cf12732a38
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
library/core/src/slice/mod.rs
View file

@ -560,8 +560,8 @@ impl<T> [T] {
#[stable(feature = "rust1", since = "1.0.0")]
#[inline]
pub fn swap(&mut self, a: usize, b: usize) {
assert_in_bounds(self.len(), a);
assert_in_bounds(self.len(), b);
let _ = &self[a];
let _ = &self[b];
// SAFETY: we just checked that both `a` and `b` are in bounds
unsafe { self.swap_unchecked(a, b) }
@ -598,8 +598,8 @@ impl<T> [T] {
pub unsafe fn swap_unchecked(&mut self, a: usize, b: usize) {
#[cfg(debug_assertions)]
{
assert_in_bounds(self.len(), a);
assert_in_bounds(self.len(), b);
let _ = &self[a];
let _ = &self[b];
}
let ptr = self.as_mut_ptr();
@ -3502,12 +3502,6 @@ impl<T> [T] {
}
}
fn assert_in_bounds(len: usize, idx: usize) {
if idx >= len {
panic!("index out of bounds: the len is {} but the index is {}", len, idx);
}
}
trait CloneFromSpec<T> {
fn spec_clone_from(&mut self, src: &[T]);
}