From 89b0e6e12ba2fb24ec0e6655a1130c16eb8d1745 Mon Sep 17 00:00:00 2001 From: Alex Crichton Date: Sat, 14 Jun 2014 11:03:34 -0700 Subject: Register new snapshots --- src/libstd/io/fs.rs | 2 +- src/libstd/io/net/tcp.rs | 8 ++++---- src/libstd/io/net/udp.rs | 2 +- src/libstd/io/net/unix.rs | 6 +++--- src/libstd/io/pipe.rs | 4 ++-- src/libstd/io/process.rs | 2 +- src/libstd/io/signal.rs | 2 +- src/libstd/io/stdio.rs | 12 ++++++------ src/libstd/io/timer.rs | 2 +- 9 files changed, 20 insertions(+), 20 deletions(-) (limited to 'src/libstd/io') diff --git a/src/libstd/io/fs.rs b/src/libstd/io/fs.rs index 10dfec0f566..20187a6dcde 100644 --- a/src/libstd/io/fs.rs +++ b/src/libstd/io/fs.rs @@ -84,7 +84,7 @@ use vec::Vec; /// configured at creation time, via the `FileAccess` parameter to /// `File::open_mode()`. pub struct File { - fd: Box, + fd: Box, path: Path, last_nread: int, } diff --git a/src/libstd/io/net/tcp.rs b/src/libstd/io/net/tcp.rs index 6c773467553..8ffb057c934 100644 --- a/src/libstd/io/net/tcp.rs +++ b/src/libstd/io/net/tcp.rs @@ -51,11 +51,11 @@ use rt::rtio; /// drop(stream); // close the connection /// ``` pub struct TcpStream { - obj: Box, + obj: Box, } impl TcpStream { - fn new(s: Box) -> TcpStream { + fn new(s: Box) -> TcpStream { TcpStream { obj: s } } @@ -326,7 +326,7 @@ impl Writer for TcpStream { /// # } /// ``` pub struct TcpListener { - obj: Box, + obj: Box, } impl TcpListener { @@ -382,7 +382,7 @@ impl Listener for TcpListener { /// a `TcpListener`'s `listen` method, and this object can be used to accept new /// `TcpStream` instances. pub struct TcpAcceptor { - obj: Box, + obj: Box, } impl TcpAcceptor { diff --git a/src/libstd/io/net/udp.rs b/src/libstd/io/net/udp.rs index 538bba36958..e1f9cb3889f 100644 --- a/src/libstd/io/net/udp.rs +++ b/src/libstd/io/net/udp.rs @@ -57,7 +57,7 @@ use rt::rtio; /// drop(socket); // close the socket /// ``` pub struct UdpSocket { - obj: Box, + obj: Box, } impl UdpSocket { diff --git a/src/libstd/io/net/unix.rs b/src/libstd/io/net/unix.rs index 9715a821e4f..8f4f66836ad 100644 --- a/src/libstd/io/net/unix.rs +++ b/src/libstd/io/net/unix.rs @@ -36,7 +36,7 @@ use rt::rtio::{RtioUnixAcceptor, RtioPipe}; /// A stream which communicates over a named pipe. pub struct UnixStream { - obj: Box, + obj: Box, } impl UnixStream { @@ -144,7 +144,7 @@ impl Writer for UnixStream { /// A value that can listen for incoming named pipe connection requests. pub struct UnixListener { /// The internal, opaque runtime Unix listener. - obj: Box, + obj: Box, } impl UnixListener { @@ -188,7 +188,7 @@ impl Listener for UnixListener { /// A value that can accept named pipe connections, returned from `listen()`. pub struct UnixAcceptor { /// The internal, opaque runtime Unix acceptor. - obj: Box, + obj: Box, } impl UnixAcceptor { diff --git a/src/libstd/io/pipe.rs b/src/libstd/io/pipe.rs index 11bb27573c2..6e2009545aa 100644 --- a/src/libstd/io/pipe.rs +++ b/src/libstd/io/pipe.rs @@ -24,7 +24,7 @@ use rt::rtio::{RtioPipe, LocalIo}; /// A synchronous, in-memory pipe. pub struct PipeStream { /// The internal, opaque runtime pipe object. - obj: Box, + obj: Box, } impl PipeStream { @@ -55,7 +55,7 @@ impl PipeStream { } #[doc(hidden)] - pub fn new(inner: Box) -> PipeStream { + pub fn new(inner: Box) -> PipeStream { PipeStream { obj: inner } } } diff --git a/src/libstd/io/process.rs b/src/libstd/io/process.rs index a626d1f3a6c..38d8475ddf7 100644 --- a/src/libstd/io/process.rs +++ b/src/libstd/io/process.rs @@ -58,7 +58,7 @@ use c_str::CString; /// assert!(child.wait().unwrap().success()); /// ``` pub struct Process { - handle: Box, + handle: Box, /// Handle to the child's stdin, if the `stdin` field of this process's /// `ProcessConfig` was `CreatePipe`. By default, this handle is `Some`. diff --git a/src/libstd/io/signal.rs b/src/libstd/io/signal.rs index 598a8667d41..4a7655a63ce 100644 --- a/src/libstd/io/signal.rs +++ b/src/libstd/io/signal.rs @@ -82,7 +82,7 @@ pub enum Signum { /// ``` pub struct Listener { /// A map from signums to handles to keep the handles in memory - handles: Vec<(Signum, Box)>, + handles: Vec<(Signum, Box)>, /// This is where all the handles send signums, which are received by /// the clients from the receiver. tx: Sender, diff --git a/src/libstd/io/stdio.rs b/src/libstd/io/stdio.rs index 84b91814c87..071480fb5ee 100644 --- a/src/libstd/io/stdio.rs +++ b/src/libstd/io/stdio.rs @@ -71,8 +71,8 @@ use str::StrSlice; // tl;dr; TTY works on everything but when windows stdout is redirected, in that // case pipe also doesn't work, but magically file does! enum StdSource { - TTY(Box), - File(Box), + TTY(Box), + File(Box), } fn src(fd: libc::c_int, readable: bool, f: |StdSource| -> T) -> T { @@ -84,7 +84,7 @@ fn src(fd: libc::c_int, readable: bool, f: |StdSource| -> T) -> T { }).map_err(IoError::from_rtio_error).unwrap() } -local_data_key!(local_stdout: Box) +local_data_key!(local_stdout: Box) /// Creates a new non-blocking handle to the stdin of the current process. /// @@ -163,7 +163,7 @@ pub fn stderr_raw() -> StdWriter { /// /// Note that this does not need to be called for all new tasks; the default /// output handle is to the process's stdout stream. -pub fn set_stdout(stdout: Box) -> Option> { +pub fn set_stdout(stdout: Box) -> Option> { local_stdout.replace(Some(stdout)).and_then(|mut s| { let _ = s.flush(); Some(s) @@ -178,7 +178,7 @@ pub fn set_stdout(stdout: Box) -> Option> { /// /// Note that this does not need to be called for all new tasks; the default /// output handle is to the process's stderr stream. -pub fn set_stderr(stderr: Box) -> Option> { +pub fn set_stderr(stderr: Box) -> Option> { local_stderr.replace(Some(stderr)).and_then(|mut s| { let _ = s.flush(); Some(s) @@ -198,7 +198,7 @@ pub fn set_stderr(stderr: Box) -> Option> { fn with_task_stdout(f: |&mut Writer| -> IoResult<()>) { let result = if Local::exists(None::) { let mut my_stdout = local_stdout.replace(None).unwrap_or_else(|| { - box stdout() as Box + box stdout() as Box }); let result = f(my_stdout); local_stdout.replace(Some(my_stdout)); diff --git a/src/libstd/io/timer.rs b/src/libstd/io/timer.rs index 1529cf8f92d..da099953a49 100644 --- a/src/libstd/io/timer.rs +++ b/src/libstd/io/timer.rs @@ -64,7 +64,7 @@ use rt::rtio::{IoFactory, LocalIo, RtioTimer, Callback}; /// # } /// ``` pub struct Timer { - obj: Box, + obj: Box, } struct TimerCallback { tx: Sender<()> } -- cgit 1.4.1-3-g733a5