OpenE2K/rust
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Replaced list::has() with list::contains()

Browse Source
This commit is contained in:
Bruno de Oliveira Abinader 2014-02-24 23:25:04 -04:00
parent 223f309fc3
commit 45fd63a8b7
1 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/libcollections/list.rs
View File

@ -63,13 +63,11 @@ impl<T> Container for List<T> {
fn is_empty(&self) -> bool { match *self { Nil => true, _ => false } }
}
/// Returns true if a list contains an element with the given value
pub fn has<T:Eq>(list: @List<T>, element: T) -> bool {
let mut found = false;
each(list, |e| {
if *e == element { found = true; false } else { true }
});
return found;
impl<T:Eq> List<T> {
/// Returns true if a list contains an element with the given value
pub fn contains(&self, element: T) -> bool {
self.iter().any(|list_element| *list_element == element)
}
}
/// Returns all but the first element of a list
@ -208,13 +206,14 @@ mod tests {
}
#[test]
fn test_has() {
let list = @List::from_vec([5, 8, 6]);
let empty = @list::Nil::<int>;
assert!((list::has(list, 5)));
assert!((!list::has(list, 7)));
assert!((list::has(list, 8)));
assert!((!list::has(empty, 5)));
fn test_contains() {
let empty = Nil::<int>;
assert!((!empty.contains(5)));
let list = List::from_vec([5, 8, 6]);
assert!((list.contains(5)));
assert!((!list.contains(7)));
assert!((list.contains(8)));
}
#[test]