about summary refs log tree commit diff
path: root/src/libstd/rt/io
diff options
context:
space:
mode:
authorPatrick Walton <pcwalton@mimiga.net>2013-10-28 15:22:49 -0700
committerPatrick Walton <pcwalton@mimiga.net>2013-10-29 10:34:17 -0700
commit7e77bf17694e31c741fe3a31c7eca5437d9cb6d5 (patch)
tree07fbf75c901955bc5b527929785e544829da92b0 /src/libstd/rt/io
parente6650c87a3800264a043b7f129e6a4841c4cc3f7 (diff)
downloadrust-7e77bf17694e31c741fe3a31c7eca5437d9cb6d5.tar.gz
rust-7e77bf17694e31c741fe3a31c7eca5437d9cb6d5.zip
librustc: Implement the `proc` type as sugar for `~once fn` and `proc`
notation for closures, and disable the feature gate for `once fn` if
used with the `~` sigil.
Diffstat (limited to 'src/libstd/rt/io')
-rw-r--r--src/libstd/rt/io/native/process.rs16
1 files changed, 9 insertions, 7 deletions
diff --git a/src/libstd/rt/io/native/process.rs b/src/libstd/rt/io/native/process.rs
index 91fff6d9263..0fa454b94d0 100644
--- a/src/libstd/rt/io/native/process.rs
+++ b/src/libstd/rt/io/native/process.rs
@@ -649,23 +649,25 @@ fn waitpid(pid: pid_t) -> int {
 
         unsafe {
 
-            let proc = OpenProcess(SYNCHRONIZE | PROCESS_QUERY_INFORMATION, FALSE, pid as DWORD);
-            if proc.is_null() {
+            let process = OpenProcess(SYNCHRONIZE | PROCESS_QUERY_INFORMATION,
+                                      FALSE,
+                                      pid as DWORD);
+            if process.is_null() {
                 fail!("failure in OpenProcess: {}", os::last_os_error());
             }
 
             loop {
                 let mut status = 0;
-                if GetExitCodeProcess(proc, &mut status) == FALSE {
-                    CloseHandle(proc);
+                if GetExitCodeProcess(process, &mut status) == FALSE {
+                    CloseHandle(process);
                     fail!("failure in GetExitCodeProcess: {}", os::last_os_error());
                 }
                 if status != STILL_ACTIVE {
-                    CloseHandle(proc);
+                    CloseHandle(process);
                     return status as int;
                 }
-                if WaitForSingleObject(proc, INFINITE) == WAIT_FAILED {
-                    CloseHandle(proc);
+                if WaitForSingleObject(process, INFINITE) == WAIT_FAILED {
+                    CloseHandle(process);
                     fail!("failure in WaitForSingleObject: {}", os::last_os_error());
                 }
             }