about summary refs log tree commit diff
path: root/src/libstd/process.rs
diff options
context:
space:
mode:
authorAlex Crichton <alex@alexcrichton.com>2016-02-04 09:53:01 -0800
committerAlex Crichton <alex@alexcrichton.com>2016-02-10 09:28:48 -0800
commitb8bd8f3d7c9c8a3187d6c80ab201f66dedee457c (patch)
tree2bda921922e188b907e6b4eaa710446ad80fefab /src/libstd/process.rs
parent627515a7ff4fe12084d7e95969bda307849b4d0e (diff)
downloadrust-b8bd8f3d7c9c8a3187d6c80ab201f66dedee457c.tar.gz
rust-b8bd8f3d7c9c8a3187d6c80ab201f66dedee457c.zip
std: Rename Stdio::None to Stdio::Null
This better reflects what it's actually doing as we don't actually have an
option for "leave this I/O slot as an empty hole".
Diffstat (limited to 'src/libstd/process.rs')
-rw-r--r--src/libstd/process.rs6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/libstd/process.rs b/src/libstd/process.rs
index 819643f20fe..fb217f9da04 100644
--- a/src/libstd/process.rs
+++ b/src/libstd/process.rs
@@ -385,7 +385,7 @@ fn setup_io(io: &Stdio, readable: bool)
         }
         StdioImp::Raw(ref owned) => (imp::Stdio::Raw(owned.raw()), None, None),
         StdioImp::Inherit => (imp::Stdio::Inherit, None, None),
-        StdioImp::None => (imp::Stdio::None, None, None),
+        StdioImp::Null => (imp::Stdio::Null, None, None),
     })
 }
 
@@ -439,7 +439,7 @@ enum StdioImp {
     MakePipe,
     Raw(imp::RawStdio),
     Inherit,
-    None,
+    Null,
 }
 
 impl Stdio {
@@ -454,7 +454,7 @@ impl Stdio {
     /// This stream will be ignored. This is the equivalent of attaching the
     /// stream to `/dev/null`
     #[stable(feature = "process", since = "1.0.0")]
-    pub fn null() -> Stdio { Stdio(StdioImp::None) }
+    pub fn null() -> Stdio { Stdio(StdioImp::Null) }
 }
 
 impl FromInner<imp::RawStdio> for Stdio {