bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

improve slice::swap panic message

Browse source
This commit is contained in:
Ibraheem Ahmed 2021-10-11 16:12:43 -04:00
parent 33ecc33268
commit 2a8ff8df54
1 changed files with 15 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -560,8 +560,9 @@ impl<T> [T] {
#[stable(feature = "rust1", since = "1.0.0")] #[stable(feature = "rust1", since = "1.0.0")]
#[inline] #[inline]
pub fn swap(&mut self, a: usize, b: usize) { pub fn swap(&mut self, a: usize, b: usize) {
assert!(a < self.len()); assert_in_bounds(self.len(), a);
assert!(b < self.len()); assert_in_bounds(self.len(), b);
// SAFETY: we just checked that both `a` and `b` are in bounds // SAFETY: we just checked that both `a` and `b` are in bounds
unsafe { self.swap_unchecked(a, b) } unsafe { self.swap_unchecked(a, b) }
} }
@ -595,8 +596,12 @@ impl<T> [T] {
/// [undefined behavior]: https://doc.rust-lang.org/reference/behavior-considered-undefined.html /// [undefined behavior]: https://doc.rust-lang.org/reference/behavior-considered-undefined.html
#[unstable(feature = "slice_swap_unchecked", issue = "88539")] #[unstable(feature = "slice_swap_unchecked", issue = "88539")]
pub unsafe fn swap_unchecked(&mut self, a: usize, b: usize) { pub unsafe fn swap_unchecked(&mut self, a: usize, b: usize) {
debug_assert!(a < self.len()); #[cfg(debug_assertions)]
debug_assert!(b < self.len()); {
assert_in_bounds(self.len(), a);
assert_in_bounds(self.len(), b);
}
let ptr = self.as_mut_ptr(); let ptr = self.as_mut_ptr();
// SAFETY: caller has to guarantee that `a < self.len()` and `b < self.len()` // SAFETY: caller has to guarantee that `a < self.len()` and `b < self.len()`
unsafe { unsafe {
@ -3497,6 +3502,12 @@ 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> { trait CloneFromSpec<T> {
fn spec_clone_from(&mut self, src: &[T]); fn spec_clone_from(&mut self, src: &[T]);
} }