Skip to content

Commit c1dfdf6

Browse files
committed
---
yaml --- r: 49995 b: refs/heads/auto c: 9a075f2 h: refs/heads/master i: 49993: 9b0e534 49991: ac99bf2 v: v3
1 parent 7177060 commit c1dfdf6

File tree

6 files changed

+5
-7
lines changed

6 files changed

+5
-7
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,5 +14,5 @@ refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0
1414
refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
1515
refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
1616
refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
17-
refs/heads/auto: 42cba98509c6da6e7f99d1d8c87f3051cb9598d4
17+
refs/heads/auto: 9a075f264a1024a3c03edc033be59971ad590171
1818
refs/heads/servo: af82457af293e2a842ba6b7759b70288da276167

branches/auto/src/libcore/rt/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ macro_rules! rtdebug (
3030
)
3131

3232
mod sched;
33-
mod io;
33+
mod rtio;
3434
pub mod uvll;
3535
mod uvio;
3636
mod uv;

branches/auto/src/libcore/rt/sched.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ use ptr::mut_null;
1616

1717
use super::work_queue::WorkQueue;
1818
use super::stack::{StackPool, StackSegment};
19-
use super::io::{EventLoop, EventLoopObject};
19+
use super::rtio::{EventLoop, EventLoopObject};
2020
use super::context::Context;
2121
use tls = super::thread_local_storage;
2222

branches/auto/src/libcore/rt/uv.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ use ptr::null;
4545
use sys::size_of;
4646
use super::uvll;
4747
use super::uvll::*;
48-
use super::io::{IpAddr, Ipv4, Ipv6};
48+
use super::rtio::{IpAddr, Ipv4, Ipv6};
4949
use unstable::finally::Finally;
5050

5151
#[cfg(test)] use unstable::run_in_bare_thread;

branches/auto/src/libcore/rt/uvio.rs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,11 @@ use option::*;
1212
use result::*;
1313

1414
use super::uv::*;
15-
use super::io::*;
15+
use super::rtio::*;
1616
use ops::Drop;
1717
use cell::{Cell, empty_cell};
1818
use cast::transmute;
19-
use super::StreamObject;
2019
use super::sched::Scheduler;
21-
use super::IoFactoryObject;
2220

2321
#[cfg(test)] use super::sched::Task;
2422
#[cfg(test)] use unstable::run_in_bare_thread;

0 commit comments

Comments
 (0)