Skip to content

Commit 38d46bd

Browse files
committed
---
yaml --- r: 56396 b: refs/heads/auto c: 0c2ab66 h: refs/heads/master v: v3
1 parent 5f3f582 commit 38d46bd

File tree

6 files changed

+7
-5
lines changed

6 files changed

+7
-5
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,6 @@ 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: 4c08a8d6c31f55bfeed0ef0c2bf8b91f90415cfe
17+
refs/heads/auto: 0c2ab662b71377efd2da7dced4f56e75cb68f540
1818
refs/heads/servo: af82457af293e2a842ba6b7759b70288da276167
1919
refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,15 @@
1111
use option::*;
1212
use result::*;
1313

14-
use super::io::net::ip::{IpAddr, Ipv4}; // n.b. Ipv4 is used only in tests
14+
use super::io::net::ip::IpAddr;
1515
use super::uv::*;
1616
use super::rtio::*;
1717
use ops::Drop;
1818
use cell::{Cell, empty_cell};
1919
use cast::transmute;
2020
use super::sched::{Scheduler, local_sched};
2121

22+
#[cfg(test)] use super::io::net::ip::Ipv4;
2223
#[cfg(test)] use super::sched::Task;
2324
#[cfg(test)] use unstable::run_in_bare_thread;
2425
#[cfg(test)] use uint;

branches/auto/src/libcore/str/ascii.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -196,6 +196,7 @@ impl ToStrConsume for ~[Ascii] {
196196
}
197197
}
198198

199+
#[cfg(test)]
199200
mod tests {
200201
use super::*;
201202

branches/auto/src/librustc/back/link.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ use core::char;
2626
use core::hash::Streaming;
2727
use core::hash;
2828
use core::io::WriterUtil;
29-
use core::libc::{c_int, c_uint, c_char};
29+
use core::libc::{c_int, c_uint};
3030
use core::os::consts::{macos, freebsd, linux, android, win32};
3131
use core::os;
3232
use core::ptr;

branches/auto/src/librustc/middle/trans/base.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ use core::hash;
7070
use core::hashmap::{HashMap, HashSet};
7171
use core::int;
7272
use core::io;
73-
use core::libc::{c_uint, c_ulonglong};
73+
use core::libc::c_uint;
7474
use core::uint;
7575
use std::time;
7676
use syntax::ast::ident;

branches/auto/src/librustc/middle/ty.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -514,7 +514,7 @@ pub struct substs {
514514
}
515515

516516
mod primitives {
517-
use super::{sty, t_box_};
517+
use super::t_box_;
518518

519519
use syntax::ast;
520520

0 commit comments

Comments
 (0)