bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

[std::vec] Rename .get_opt() to .get()

Browse source
This commit is contained in:
Simon Sapin 2013-12-23 14:38:02 +01:00
parent 232d8e5605
commit d25334d63a
1 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/libstd/vec.rs
View file

@ -941,7 +941,7 @@ pub trait ImmutableVector<'a, T> {
/// Returns the element of a vector at the given index, or `None` if the /// Returns the element of a vector at the given index, or `None` if the
/// index is out of bounds /// index is out of bounds
fn get_opt(&self, index: uint) -> Option<&'a T>; fn get(&self, index: uint) -> Option<&'a T>;
/// Returns the first element of a vector, failing if the vector is empty. /// Returns the first element of a vector, failing if the vector is empty.
fn head(&self) -> &'a T; fn head(&self) -> &'a T;
/// Returns the first element of a vector, or `None` if it is empty /// Returns the first element of a vector, or `None` if it is empty
@ -1118,7 +1118,7 @@ impl<'a,T> ImmutableVector<'a, T> for &'a [T] {
} }
#[inline] #[inline]
fn get_opt(&self, index: uint) -> Option<&'a T> { fn get(&self, index: uint) -> Option<&'a T> {
if index < self.len() { Some(&self[index]) } else { None } if index < self.len() { Some(&self[index]) } else { None }
} }
@ -3043,13 +3043,13 @@ mod tests {
} }
#[test] #[test]
fn test_get_opt() { fn test_get() {
let mut a = ~[11]; let mut a = ~[11];
assert_eq!(a.get_opt(1), None); assert_eq!(a.get(1), None);
a = ~[11, 12]; a = ~[11, 12];
assert_eq!(a.get_opt(1).unwrap(), &12); assert_eq!(a.get(1).unwrap(), &12);
a = ~[11, 12, 13]; a = ~[11, 12, 13];
assert_eq!(a.get_opt(1).unwrap(), &12); assert_eq!(a.get(1).unwrap(), &12);
} }
#[test] #[test]