Skip to content

Commit deb6b04

Browse files
committed
auto merge of #15206 : omasanori/rust/use-reexported, r=alexcrichton
We use re-exported pathes (e.g. std::io::Command) and original ones (e.g. std::io::process::Command) together in examples now. Using re-exported ones consistently avoids confusion.
2 parents c0f2310 + dfef422 commit deb6b04

File tree

4 files changed

+10
-10
lines changed

4 files changed

+10
-10
lines changed

src/libstd/io/mod.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ Some examples of obvious things you might want to do
8383
8484
```rust
8585
# #![allow(unused_must_use)]
86-
use std::io::net::tcp::TcpStream;
86+
use std::io::TcpStream;
8787
8888
# // connection doesn't fail if a server is running on 8080
8989
# // locally, we still want to be type checking this code, so lets

src/libstd/io/net/tcp.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ use rt::rtio;
4141
///
4242
/// ```no_run
4343
/// # #![allow(unused_must_use)]
44-
/// use std::io::net::tcp::TcpStream;
44+
/// use std::io::TcpStream;
4545
///
4646
/// let mut stream = TcpStream::connect("127.0.0.1", 34254);
4747
///
@@ -162,7 +162,7 @@ impl TcpStream {
162162
/// ```no_run
163163
/// # #![allow(unused_must_use)]
164164
/// use std::io::timer;
165-
/// use std::io::net::tcp::TcpStream;
165+
/// use std::io::TcpStream;
166166
///
167167
/// let mut stream = TcpStream::connect("127.0.0.1", 34254).unwrap();
168168
/// let stream2 = stream.clone();
@@ -406,7 +406,7 @@ impl TcpAcceptor {
406406
///
407407
/// ```no_run
408408
/// # #![allow(experimental)]
409-
/// use std::io::net::tcp::TcpListener;
409+
/// use std::io::TcpListener;
410410
/// use std::io::{Listener, Acceptor, TimedOut};
411411
///
412412
/// let mut a = TcpListener::bind("127.0.0.1", 8482).listen().unwrap();

src/libstd/io/process.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -476,8 +476,8 @@ impl Process {
476476
///
477477
/// ```no_run
478478
/// # #![allow(experimental)]
479-
/// use std::io::process::{Command, ProcessExit};
480-
/// use std::io::IoResult;
479+
/// use std::io::{Command, IoResult};
480+
/// use std::io::process::ProcessExit;
481481
///
482482
/// fn run_gracefully(prog: &str) -> IoResult<ProcessExit> {
483483
/// let mut p = try!(Command::new("long-running-process").spawn());

src/libstd/io/timer.rs

+4-4
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ impl Timer {
110110
/// # Example
111111
///
112112
/// ```rust
113-
/// use std::io::timer::Timer;
113+
/// use std::io::Timer;
114114
///
115115
/// let mut timer = Timer::new().unwrap();
116116
/// let ten_milliseconds = timer.oneshot(10);
@@ -122,7 +122,7 @@ impl Timer {
122122
/// ```
123123
///
124124
/// ```rust
125-
/// use std::io::timer::Timer;
125+
/// use std::io::Timer;
126126
///
127127
/// // Incorrect, method chaining-style:
128128
/// let mut five_ms = Timer::new().unwrap().oneshot(5);
@@ -152,7 +152,7 @@ impl Timer {
152152
/// # Example
153153
///
154154
/// ```rust
155-
/// use std::io::timer::Timer;
155+
/// use std::io::Timer;
156156
///
157157
/// let mut timer = Timer::new().unwrap();
158158
/// let ten_milliseconds = timer.periodic(10);
@@ -170,7 +170,7 @@ impl Timer {
170170
/// ```
171171
///
172172
/// ```rust
173-
/// use std::io::timer::Timer;
173+
/// use std::io::Timer;
174174
///
175175
/// // Incorrect, method chaining-style.
176176
/// let mut five_ms = Timer::new().unwrap().periodic(5);

0 commit comments

Comments
 (0)