---

yaml
---
r: 73471
b: refs/heads/dist-snap
c: 04a3935
h: refs/heads/master
i:
  73469: 0e25a82
  73467: a55476f
  73463: 405f8a7
  73455: 6386c49
  73439: b79aa99
  73407: f5beeaa
  73343: 886b5f8
  73215: 9e7beb4
v: v3

Author: gareth

[refs]

@@ -7,7 +7,7 @@ refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c
 refs/heads/incoming: b50030718cf28f2a5a81857a26b57442734fe854
-refs/heads/dist-snap: 49a1ab8745338e6ac6da65c3fc4e541761f6c760
+refs/heads/dist-snap: 04a39359f86e7bc9700027139c2e6c8d27c67eba
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
 refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0

branches/dist-snap/src/libstd/run.rs

@@ -45,10 +45,10 @@ pub struct Process {
     /// Some(fd), or None when stdin is being redirected from a fd not created by Process::new.
     priv input: Option<c_int>,
 
-    /// Some(fd), or None when stdout is being redirected to a fd not created by Process::new.
+    /// Some(file), or None when stdout is being redirected to a fd not created by Process::new.
     priv output: Option<*libc::FILE>,
 
-    /// Some(fd), or None when stderr is being redirected to a fd not created by Process::new.
+    /// Some(file), or None when stderr is being redirected to a fd not created by Process::new.
     priv error: Option<*libc::FILE>,
 
     /// None until finish() is called.
@@ -191,23 +191,23 @@ pub impl Process {
     /// Returns the unique id of the process
     fn get_id(&self) -> pid_t { self.pid }
 
-    priv fn unwrap_input(&mut self) -> c_int {
+    priv fn input_fd(&mut self) -> c_int {
         match self.input {
             Some(fd) => fd,
             None => fail!("This Process's stdin was redirected to an \
                            existing file descriptor.")
         }
     }
 
-    priv fn unwrap_output(&mut self) -> *libc::FILE {
+    priv fn output_file(&mut self) -> *libc::FILE {
         match self.output {
             Some(file) => file,
             None => fail!("This Process's stdout was redirected to an \
                            existing file descriptor.")
         }
     }
 
-    priv fn unwrap_error(&mut self) -> *libc::FILE {
+    priv fn error_file(&mut self) -> *libc::FILE {
         match self.error {
             Some(file) => file,
             None => fail!("This Process's stderr was redirected to an \
@@ -255,7 +255,7 @@ pub impl Process {
      */
     fn input(&mut self) -> @io::Writer {
         // FIXME: the Writer can still be used after self is destroyed: #2625
-       io::fd_writer(self.unwrap_input(), false)
+       io::fd_writer(self.input_fd(), false)
     }
 
     /**
@@ -265,7 +265,7 @@ pub impl Process {
      */
     fn output(&mut self) -> @io::Reader {
         // FIXME: the Reader can still be used after self is destroyed: #2625
-        io::FILE_reader(self.unwrap_output(), false)
+        io::FILE_reader(self.output_file(), false)
     }
 
     /**
@@ -275,7 +275,7 @@ pub impl Process {
      */
     fn error(&mut self) -> @io::Reader {
         // FIXME: the Reader can still be used after self is destroyed: #2625
-        io::FILE_reader(self.unwrap_error(), false)
+        io::FILE_reader(self.error_file(), false)
     }
 
     /**
@@ -341,8 +341,8 @@ pub impl Process {
      */
     fn finish_with_output(&mut self) -> ProcessOutput {
 
-        let output_file = self.unwrap_output();
-        let error_file = self.unwrap_error();
+        let output_file = self.output_file();
+        let error_file = self.error_file();
 
         // Spawn two entire schedulers to read both stdout and sterr
         // in parallel so we don't deadlock while blocking on one
@@ -814,7 +814,7 @@ pub fn process_output(prog: &str, args: &[~str]) -> ProcessOutput {
  *
  * Note that this is private to avoid race conditions on unix where if
  * a user calls waitpid(some_process.get_id()) then some_process.finish()
- * and some_process.destroy() and some_process.drop() will then either
+ * and some_process.destroy() and some_process.finalize() will then either
  * operate on a none-existant process or, even worse, on a newer process
  * with the same id.
  */