Skip to content

Commit b276512

Browse files
committed
---
yaml --- r: 50747 b: refs/heads/try c: 9a075f2 h: refs/heads/master i: 50745: 72caff6 50743: 0fbc7ef v: v3
1 parent 6bc74f6 commit b276512

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
@@ -2,7 +2,7 @@
22
refs/heads/master: 5f13e9ccc2e3328d4cd8ca49f84e6840dd998346
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
44
refs/heads/snap-stage3: f7a2371c176663d59062ec5158f39faecba45768
5-
refs/heads/try: 42cba98509c6da6e7f99d1d8c87f3051cb9598d4
5+
refs/heads/try: 9a075f264a1024a3c03edc033be59971ad590171
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
88
refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c

branches/try/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/try/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/try/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/try/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)