Skip to content

Commit

Permalink
[std::vec] Rename .get_opt() to .get()
Browse files Browse the repository at this point in the history
  • Loading branch information
SimonSapin committed Jan 21, 2014
1 parent 232d8e5 commit d25334d
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions src/libstd/vec.rs
Expand Up @@ -941,7 +941,7 @@ pub trait ImmutableVector<'a, T> {

/// Returns the element of a vector at the given index, or `None` if the
/// 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.
fn head(&self) -> &'a T;
/// Returns the first element of a vector, or `None` if it is empty
Expand Down Expand Up @@ -1118,7 +1118,7 @@ impl<'a,T> ImmutableVector<'a, T> for &'a [T] {
}

#[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 }
}

Expand Down Expand Up @@ -3043,13 +3043,13 @@ mod tests {
}

#[test]
fn test_get_opt() {
fn test_get() {
let mut a = ~[11];
assert_eq!(a.get_opt(1), None);
assert_eq!(a.get(1), None);
a = ~[11, 12];
assert_eq!(a.get_opt(1).unwrap(), &12);
assert_eq!(a.get(1).unwrap(), &12);
a = ~[11, 12, 13];
assert_eq!(a.get_opt(1).unwrap(), &12);
assert_eq!(a.get(1).unwrap(), &12);
}

#[test]
Expand Down

0 comments on commit d25334d

Please sign in to comment.