auto merge of #13099 : FlaPer87/rust/master, r=huonw

2 files changed, 1 insertions, 5 deletions

diff --git a/src/libsync/arc.rs b/src/libsync/arc.rs
index 57187e27323..0bc3b121a88 100644
--- a/src/libsync/arc.rs
+++ b/src/libsync/arc.rs
@@ -50,13 +50,10 @@ use sync;
 use sync::{Mutex, RWLock};
 
 use std::cast;
-use std::kinds::marker;
+use std::kinds::{Share, marker};
 use std::sync::arc::UnsafeArc;
 use std::task;
 
-#[cfg(stage0)]
-use std::kinds::Share;
-
 /// As sync::condvar, a mechanism for unlock-and-descheduling and
 /// signaling, for use with the Arc types.
 pub struct ArcCondvar<'a> {
diff --git a/src/libsync/lib.rs b/src/libsync/lib.rs
index 5e97b92e738..70874a029ac 100644
--- a/src/libsync/lib.rs
+++ b/src/libsync/lib.rs
@@ -20,7 +20,6 @@
       html_favicon_url = "http://www.rust-lang.org/favicon.ico",
       html_root_url = "http://static.rust-lang.org/doc/master")];
 #[feature(phase)];
-#[allow(deprecated_owned_vector)]; // NOTE: remove after stage0
 
 #[cfg(test)] #[phase(syntax, link)] extern crate log;