Merge remote-tracking branch 'remotes/origin/master' into str-remove-null

[rust.git] / src / libstd / os.rs

diff --git a/src/libstd/os.rs b/src/libstd/os.rs
index b6c9979cc7d3df525b1ef412dd656df7187ec2bd..6d109aac4ea6cfb40166736fe614d9845b563053 100644 (file)
--- a/src/libstd/os.rs
+++ b/src/libstd/os.rs
@@ -220,7 +220,7 @@ unsafe fn get_env_pairs() -> ~[~str] {
 
         fn env_convert(input: ~[~str]) -> ~[(~str, ~str)] {
             let mut pairs = ~[];
-            foreach p in input.iter() {
+            for p in input.iter() {
                 let vs: ~[&str] = p.splitn_iter('=', 1).collect();
                 debug!("splitting: len: %u",
                     vs.len());
@@ -1125,7 +1125,7 @@ pub fn set_exit_status(code: int) {
 
 unsafe fn load_argc_and_argv(argc: c_int, argv: **c_char) -> ~[~str] {
     let mut args = ~[];
-    foreach i in range(0u, argc as uint) {
+    for i in range(0u, argc as uint) {
         args.push(str::raw::from_c_str(*argv.offset(i as int)));
     }
     args
@@ -1174,7 +1174,7 @@ pub fn real_args() -> ~[~str] {
     let szArgList = unsafe { CommandLineToArgvW(lpCmdLine, lpArgCount) };
 
     let mut args = ~[];
-    foreach i in range(0u, nArgs as uint) {
+    for i in range(0u, nArgs as uint) {
         unsafe {
             // Determine the length of this argument.
             let ptr = *szArgList.offset(i as int);
@@ -1431,7 +1431,7 @@ pub fn new(min_len: uint, options: ~[MapOption]) -> Result<~MemoryMap, MapError>
         let mut offset: off_t = 0;
         let len = round_up(min_len, page_size()) as size_t;
 
-        foreach &o in options.iter() {
+        for &o in options.iter() {
             match o {
                 MapReadable => { prot |= libc::PROT_READ; },
                 MapWritable => { prot |= libc::PROT_WRITE; },
@@ -1504,7 +1504,7 @@ pub fn new(min_len: uint, options: ~[MapOption]) -> Result<~MemoryMap, MapError>
         let mut offset: uint = 0;
         let len = round_up(min_len, page_size()) as SIZE_T;
 
-        foreach &o in options.iter() {
+        for &o in options.iter() {
             match o {
                 MapReadable => { readable = true; },
                 MapWritable => { writable = true; },
@@ -1800,7 +1800,7 @@ fn test_self_exe_path() {
     fn test_env_getenv() {
         let e = env();
         assert!(e.len() > 0u);
-        foreach p in e.iter() {
+        for p in e.iter() {
             let (n, v) = (*p).clone();
             debug!(n.clone());
             let v2 = getenv(n);
@@ -1844,7 +1844,7 @@ fn homedir() {
         setenv("HOME", "");
         assert!(os::homedir().is_none());
 
-        foreach s in oldhome.iter() { setenv("HOME", *s) }
+        for s in oldhome.iter() { setenv("HOME", *s) }
     }
 
     #[test]
@@ -1892,7 +1892,7 @@ fn list_dir() {
         // Just assuming that we've got some contents in the current directory
         assert!(dirs.len() > 0u);
 
-        foreach dir in dirs.iter() {
+        for dir in dirs.iter() {
             debug!((*dir).clone());
         }
     }