core: rename vec.filter to vec.filtered

2 files changed, 6 insertions, 6 deletions

diff --git a/src/libcore/os.rs b/src/libcore/os.rs
index 587d684c60c..6b3f97daa76 100644
--- a/src/libcore/os.rs
+++ b/src/libcore/os.rs
@@ -619,7 +619,7 @@ pub fn list_dir(p: &Path) -> ~[~str] {
     #[cfg(windows)]
     fn star(p: &Path) -> Path { p.push("*") }
 
-    do rustrt::rust_list_files2(star(p).to_str()).filter |filename| {
+    do rustrt::rust_list_files2(star(p).to_str()).filtered |filename| {
         *filename != ~"." && *filename != ~".."
     }
 }
diff --git a/src/libcore/vec.rs b/src/libcore/vec.rs
index ab0b5049f8e..511063bb44f 100644
--- a/src/libcore/vec.rs
+++ b/src/libcore/vec.rs
@@ -853,7 +853,7 @@ pub pure fn filter_map<T, U: Copy>(v: &[T], f: fn(t: &T) -> Option<U>)
  * Apply function `f` to each element of `v` and return a vector containing
  * only those elements for which `f` returned true.
  */
-pub pure fn filter<T: Copy>(v: &[T], f: fn(t: &T) -> bool) -> ~[T] {
+pub pure fn filtered<T: Copy>(v: &[T], f: fn(t: &T) -> bool) -> ~[T] {
     let mut result = ~[];
     for each(v) |elem| {
         if f(elem) { unsafe { result.push(*elem); } }
@@ -1752,7 +1752,7 @@ impl<T: Eq> &[T]: ImmutableEqVector<T> {
 }
 
 pub trait ImmutableCopyableVector<T> {
-    pure fn filter(&self, f: fn(t: &T) -> bool) -> ~[T];
+    pure fn filtered(&self, f: fn(&T) -> bool) -> ~[T];
     pure fn rfind(&self, f: fn(t: &T) -> bool) -> Option<T>;
     pure fn partitioned(&self, f: fn(&T) -> bool) -> (~[T], ~[T]);
 }
@@ -1767,8 +1767,8 @@ impl<T: Copy> &[T]: ImmutableCopyableVector<T> {
      * containing only those elements for which `f` returned true.
      */
     #[inline]
-    pure fn filter(&self, f: fn(t: &T) -> bool) -> ~[T] {
-        filter(*self, f)
+    pure fn filtered(&self, f: fn(t: &T) -> bool) -> ~[T] {
+        filtered(*self, f)
     }
 
     /**
@@ -3618,7 +3618,7 @@ mod tests {
     fn test_filter_fail() {
         let v = [(~0, @0), (~0, @0), (~0, @0), (~0, @0)];
         let mut i = 0;
-        do filter(v) |_elt| {
+        do v.filtered |_elt| {
             if i == 2 {
                 fail
             }