Skip to content

Commit 5737d1f

Browse files
committed
auto merge of #12490 : zslayton/rust/doc-fix-12386, r=alexcrichton
Attn: @huonw Addresses #12386.
2 parents 86177db + 90f2d1d commit 5737d1f

File tree

4 files changed

+9
-19
lines changed

4 files changed

+9
-19
lines changed

src/libstd/io/mod.rs

-14
Original file line numberDiff line numberDiff line change
@@ -214,46 +214,32 @@ pub use self::buffered::{BufferedReader, BufferedWriter, BufferedStream,
214214
LineBufferedWriter};
215215
pub use self::comm_adapters::{PortReader, ChanWriter};
216216

217-
/// Various utility functions useful for writing I/O tests
218217
pub mod test;
219218

220-
/// Synchronous, non-blocking filesystem operations.
221219
pub mod fs;
222220

223-
/// Synchronous, in-memory I/O.
224221
pub mod pipe;
225222

226-
/// Child process management.
227223
pub mod process;
228224

229-
/// Synchronous, non-blocking network I/O.
230225
pub mod net;
231226

232-
/// Readers and Writers for memory buffers and strings.
233227
mod mem;
234228

235-
/// Non-blocking access to stdin, stdout, stderr
236229
pub mod stdio;
237230

238-
/// Implementations for Result
239231
mod result;
240232

241-
/// Extension traits
242233
pub mod extensions;
243234

244-
/// Basic Timer
245235
pub mod timer;
246236

247-
/// Buffered I/O wrappers
248237
mod buffered;
249238

250-
/// Signal handling
251239
pub mod signal;
252240

253-
/// Utility implementations of Reader and Writer
254241
pub mod util;
255242

256-
/// Adapatation of Chan/Port types to a Writer/Reader type.
257243
mod comm_adapters;
258244

259245
/// The default buffer size for various I/O operations

src/libstd/io/stdio.rs

+5-5
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,12 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11-
/*!
11+
/*! Non-blocking access to stdin, stdout, and stderr.
1212
13-
This modules provides bindings to the local event loop's TTY interface, using it
14-
to have synchronous, but non-blocking versions of stdio. These handles can be
15-
inspected for information about terminal dimensions or related information
16-
about the stream or terminal that it is attached to.
13+
This module provides bindings to the local event loop's TTY interface, using it
14+
to offer synchronous but non-blocking versions of stdio. These handles can be
15+
inspected for information about terminal dimensions or for related information
16+
about the stream or terminal to which it is attached.
1717
1818
# Example
1919

src/libstd/io/test.rs

+2
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11+
/*! Various utility functions useful for writing I/O tests */
12+
1113
#[macro_escape];
1214

1315
use os;

src/libstd/io/util.rs

+2
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11+
/*! Utility implementations of Reader and Writer */
12+
1113
use prelude::*;
1214
use cmp;
1315
use io;

0 commit comments

Comments
 (0)