about summary refs log tree commit diff
path: root/src/libcore
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2013-05-03 23:48:36 -0700
committerbors <bors@rust-lang.org>2013-05-03 23:48:36 -0700
commita47e4cb22fbced2391845f7bfc7a458bca8c8273 (patch)
tree18f32cd44b67bf0678e5990ad199c566be5a0dfc /src/libcore
parentc3ab74b8b933a1bc2c5f207ae5c023cf3e7aeb58 (diff)
parent2df8799f766c3a4871fe12761843ef9a5bc83659 (diff)
downloadrust-a47e4cb22fbced2391845f7bfc7a458bca8c8273.tar.gz
rust-a47e4cb22fbced2391845f7bfc7a458bca8c8273.zip
auto merge of #6229 : catamorphism/rust/warning-police, r=catamorphism
Diffstat (limited to 'src/libcore')
-rw-r--r--src/libcore/task/mod.rs2
-rw-r--r--src/libcore/unstable/lang.rs2
2 files changed, 3 insertions, 1 deletions
diff --git a/src/libcore/task/mod.rs b/src/libcore/task/mod.rs
index ebf2494c8ee..fd695c16ea7 100644
--- a/src/libcore/task/mod.rs
+++ b/src/libcore/task/mod.rs
@@ -39,7 +39,7 @@ use result::Result;
 use comm::{stream, Chan, GenericChan, GenericPort, Port};
 use prelude::*;
 use result;
-use task::rt::{task_id, sched_id, rust_task};
+use task::rt::{task_id, sched_id};
 use util;
 use util::replace;
 use unstable::finally::Finally;
diff --git a/src/libcore/unstable/lang.rs b/src/libcore/unstable/lang.rs
index a8a0d40db1f..7cd218639c0 100644
--- a/src/libcore/unstable/lang.rs
+++ b/src/libcore/unstable/lang.rs
@@ -17,7 +17,9 @@ use str;
 use sys;
 use unstable::exchange_alloc;
 use cast::transmute;
+#[cfg(not(stage0))]
 use rt::{context, OldTaskContext};
+#[cfg(not(stage0))]
 use rt::local_services::borrow_local_services;
 
 #[allow(non_camel_case_types)]