bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

[std::vec] Rename .pop_opt() to .pop(), drop the old .pop() behavior

Browse source
This commit is contained in:
Simon Sapin 2013-12-23 16:20:52 +01:00
parent aa66b91767
commit bada25e425
43 changed files with 128 additions and 133 deletions
Download patch file Download diff file Expand all files Collapse all files

31
src/libstd/vec.rs
View file

@ -1381,10 +1381,8 @@ pub trait OwnedVector<T> {
/// assert!(a == ~[~1, ~2, ~3, ~4]);
/// ```
fn push_all_move(&mut self, rhs: ~[T]);
/// Remove the last element from a vector and return it, failing if it is empty
fn pop(&mut self) -> T;
/// Remove the last element from a vector and return it, or `None` if it is empty
fn pop_opt(&mut self) -> Option<T>;
fn pop(&mut self) -> Option<T>;
/// Removes the first element from a vector and return it
fn shift(&mut self) -> T;
/// Removes the first element from a vector and return it, or `None` if it is empty
@ -1565,7 +1563,7 @@ impl<T> OwnedVector<T> for ~[T] {
}
}
fn pop_opt(&mut self) -> Option<T> {
fn pop(&mut self) -> Option<T> {
match self.len() {
0 => None,
ln => {
@ -1579,11 +1577,6 @@ impl<T> OwnedVector<T> for ~[T] {
}
#[inline]
fn pop(&mut self) -> T {
self.pop_opt().expect("pop: empty vector")
}
#[inline]
fn shift(&mut self) -> T {
self.shift_opt().expect("shift: empty vector")
@ -3168,28 +3161,16 @@ mod tests {
assert_eq!(vec.slice_to(0), &[]);
}
#[test]
fn test_pop() {
// Test on-heap pop.
let mut v = ~[1, 2, 3, 4, 5];
let e = v.pop();
assert_eq!(v.len(), 4u);
assert_eq!(v[0], 1);
assert_eq!(v[1], 2);
assert_eq!(v[2], 3);
assert_eq!(v[3], 4);
assert_eq!(e, 5);
}
#[test]
fn test_pop_opt() {
fn test_pop() {
let mut v = ~[5];
let e = v.pop_opt();
let e = v.pop();
assert_eq!(v.len(), 0);
assert_eq!(e, Some(5));
let f = v.pop_opt();
let f = v.pop();
assert_eq!(f, None);
let g = v.pop_opt();
let g = v.pop();
assert_eq!(g, None);
}