auto merge of #6229 : catamorphism/rust/warning-police, r=catamorphism

This commit is contained in:
bors 2013-05-03 23:48:36 -07:00
commit a47e4cb22f
13 changed files with 17 additions and 26 deletions

View file

@ -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;

View file

@ -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)]