about summary refs log tree commit diff
path: root/src/libstd
diff options
context:
space:
mode:
Diffstat (limited to 'src/libstd')
-rw-r--r--src/libstd/fs.rs4
-rw-r--r--src/libstd/json.rs2
-rw-r--r--src/libstd/list.rs2
-rw-r--r--src/libstd/net.rs2
-rw-r--r--src/libstd/run_program.rs2
-rw-r--r--src/libstd/test.rs4
6 files changed, 8 insertions, 8 deletions
diff --git a/src/libstd/fs.rs b/src/libstd/fs.rs
index 7175df40a16..eac2347748e 100644
--- a/src/libstd/fs.rs
+++ b/src/libstd/fs.rs
@@ -317,13 +317,13 @@ fn normalize(p: path) -> path {
     ret s;
 
     fn strip_dots(s: [path]) -> [path] {
-        vec::filter_map({ |elem|
+        vec::filter_map(s, { |elem|
             if elem == "." {
                 option::none
             } else {
                 option::some(elem)
             }
-        }, s)
+        })
     }
 
     fn rollup_doubledots(s: [path]) -> [path] {
diff --git a/src/libstd/json.rs b/src/libstd/json.rs
index 945845e6c55..e0b559ec747 100644
--- a/src/libstd/json.rs
+++ b/src/libstd/json.rs
@@ -50,7 +50,7 @@ fn to_str(j: json) -> str {
         list(@js) {
             str::concat(["[",
                     str::connect(
-                        vec::map::<json,str>({ |e| to_str(e) }, js),
+                        vec::map::<json,str>(js, { |e| to_str(e) }),
                         ", "),
                     "]"])
         }
diff --git a/src/libstd/list.rs b/src/libstd/list.rs
index d0c7582426a..420e0781723 100644
--- a/src/libstd/list.rs
+++ b/src/libstd/list.rs
@@ -28,7 +28,7 @@ Function: from_vec
 Create a list from a vector
 */
 fn from_vec<copy T>(v: [const T]) -> list<T> {
-    *vec::foldr({ |h, t| @cons(h, t) }, @nil::<T>, v)
+    *vec::foldr(v, @nil::<T>, { |h, t| @cons(h, t) })
 }
 
 /*
diff --git a/src/libstd/net.rs b/src/libstd/net.rs
index 5ee7cfa602c..359e9838e28 100644
--- a/src/libstd/net.rs
+++ b/src/libstd/net.rs
@@ -49,7 +49,7 @@ Failure:
 String must be a valid IPv4 address
 */
 fn parse_addr(ip: str) -> ip_addr {
-    let parts = vec::map({|s| uint::from_str(s) }, str::split(ip, "."[0]));
+    let parts = vec::map(str::split(ip, "."[0]), {|s| uint::from_str(s) });
     if vec::len(parts) != 4u { fail "Too many dots in IP address"; }
     for i in parts { if i > 255u { fail "Invalid IP Address part."; } }
     ipv4(parts[0] as u8, parts[1] as u8, parts[2] as u8, parts[3] as u8)
diff --git a/src/libstd/run_program.rs b/src/libstd/run_program.rs
index ca4763ca7e2..55163696579 100644
--- a/src/libstd/run_program.rs
+++ b/src/libstd/run_program.rs
@@ -122,7 +122,7 @@ fn spawn_process(prog: str, args: [str], in_fd: fd_t,
     // Note: we have to hold on to these vector references while we hold a
     // pointer to their buffers
     let prog = prog;
-    let args = vec::map({|arg| @arg }, args);
+    let args = vec::map(args, {|arg| @arg });
     let argv = arg_vec(prog, args);
     let pid =
         rustrt::rust_run_program(vec::unsafe::to_ptr(argv), in_fd, out_fd,
diff --git a/src/libstd/test.rs b/src/libstd/test.rs
index abf563197a5..fbb63844847 100644
--- a/src/libstd/test.rs
+++ b/src/libstd/test.rs
@@ -276,7 +276,7 @@ fn filter_tests<copy T>(opts: test_opts,
 
         let filter = bind filter_fn(_, filter_str);
 
-        vec::filter_map(filter, filtered)
+        vec::filter_map(filtered, filter)
     };
 
     // Maybe pull out the ignored test and unignore them
@@ -292,7 +292,7 @@ fn filter_tests<copy T>(opts: test_opts,
             } else { ret option::none; }
         };
 
-        vec::filter_map(bind filter(_), filtered)
+        vec::filter_map(filtered, bind filter(_))
     };
 
     // Sort the tests alphabetically