Register new snapshots

5 files changed, 0 insertions, 71 deletions

diff --git a/src/libsync/comm/mod.rs b/src/libsync/comm/mod.rs
index 16f6eea6144..c8b86c47c90 100644
--- a/src/libsync/comm/mod.rs
+++ b/src/libsync/comm/mod.rs
@@ -386,18 +386,10 @@ pub struct Receiver<T> {
 /// whenever `next` is called, waiting for a new message, and `None` will be
 /// returned when the corresponding channel has hung up.
 #[unstable]
-#[cfg(not(stage0))]
 pub struct Messages<'a, T:'a> {
     rx: &'a Receiver<T>
 }
 
-/// Stage0 only
-#[cfg(stage0)]
-#[unstable]
-pub struct Messages<'a, T> {
-    rx: &'a Receiver<T>
-}
-
 /// The sending-half of Rust's asynchronous channel type. This half can only be
 /// owned by one task, but it can be cloned to send to other tasks.
 #[unstable]
diff --git a/src/libsync/comm/select.rs b/src/libsync/comm/select.rs
index dc9891dd1ee..669c1c958b8 100644
--- a/src/libsync/comm/select.rs
+++ b/src/libsync/comm/select.rs
@@ -76,7 +76,6 @@ pub struct Select {
 /// A handle to a receiver which is currently a member of a `Select` set of
 /// receivers.  This handle is used to keep the receiver in the set as well as
 /// interact with the underlying receiver.
-#[cfg(not(stage0))]
 pub struct Handle<'rx, T:'rx> {
     /// The ID of this handle, used to compare against the return value of
     /// `Select::wait()`
@@ -92,23 +91,6 @@ pub struct Handle<'rx, T:'rx> {
     rx: &'rx Receiver<T>,
 }
 
-/// Stage0 only
-#[cfg(stage0)]
-pub struct Handle<'rx, T> {
-    /// The ID of this handle, used to compare against the return value of
-    /// `Select::wait()`
-    id: uint,
-    selector: &'rx Select,
-    next: *mut Handle<'static, ()>,
-    prev: *mut Handle<'static, ()>,
-    added: bool,
-    packet: &'rx Packet+'rx,
-
-    // due to our fun transmutes, we be sure to place this at the end. (nothing
-    // previous relies on T)
-    rx: &'rx Receiver<T>,
-}
-
 struct Packets { cur: *mut Handle<'static, ()> }
 
 #[doc(hidden)]
diff --git a/src/libsync/lib.rs b/src/libsync/lib.rs
index c2744751ee5..e0acce1cd94 100644
--- a/src/libsync/lib.rs
+++ b/src/libsync/lib.rs
@@ -29,13 +29,9 @@
 
 #![feature(phase, globs, macro_rules, unsafe_destructor)]
 #![feature(import_shadowing)]
-#![feature(issue_5723_bootstrap)]
 #![deny(missing_doc)]
 #![no_std]
 
-// NOTE(stage0, pcwalton): Remove after snapshot.
-#![allow(unknown_features)]
-
 #[phase(plugin, link)] extern crate core;
 extern crate alloc;
 extern crate collections;
diff --git a/src/libsync/lock.rs b/src/libsync/lock.rs
index e1cae6c62d5..08421d24fbb 100644
--- a/src/libsync/lock.rs
+++ b/src/libsync/lock.rs
@@ -180,7 +180,6 @@ pub struct Mutex<T> {
 
 /// An guard which is created by locking a mutex. Through this guard the
 /// underlying data can be accessed.
-#[cfg(not(stage0))]
 pub struct MutexGuard<'a, T:'a> {
     // FIXME #12808: strange name to try to avoid interfering with
     // field accesses of the contained type via Deref
@@ -190,17 +189,6 @@ pub struct MutexGuard<'a, T:'a> {
     pub cond: Condvar<'a>,
 }
 
-/// stage0 only
-#[cfg(stage0)]
-pub struct MutexGuard<'a, T> {
-    // FIXME #12808: strange name to try to avoid interfering with
-    // field accesses of the contained type via Deref
-    _data: &'a mut T,
-    /// Inner condition variable connected to the locked mutex that this guard
-    /// was created from. This can be used for atomic-unlock-and-deschedule.
-    pub cond: Condvar<'a>,
-}
-
 impl<T: Send> Mutex<T> {
     /// Creates a new mutex to protect the user-supplied data.
     pub fn new(user_data: T) -> Mutex<T> {
@@ -292,7 +280,6 @@ pub struct RWLock<T> {
 
 /// A guard which is created by locking an rwlock in write mode. Through this
 /// guard the underlying data can be accessed.
-#[cfg(not(stage0))]
 pub struct RWLockWriteGuard<'a, T:'a> {
     // FIXME #12808: strange name to try to avoid interfering with
     // field accesses of the contained type via Deref
@@ -302,20 +289,8 @@ pub struct RWLockWriteGuard<'a, T:'a> {
     pub cond: Condvar<'a>,
 }
 
-/// stage0 only
-#[cfg(stage0)]
-pub struct RWLockWriteGuard<'a, T> {
-    // FIXME #12808: strange name to try to avoid interfering with
-    // field accesses of the contained type via Deref
-    _data: &'a mut T,
-    /// Inner condition variable that can be used to sleep on the write mode of
-    /// this rwlock.
-    pub cond: Condvar<'a>,
-}
-
 /// A guard which is created by locking an rwlock in read mode. Through this
 /// guard the underlying data can be accessed.
-#[cfg(not(stage0))]
 pub struct RWLockReadGuard<'a, T:'a> {
     // FIXME #12808: strange names to try to avoid interfering with
     // field accesses of the contained type via Deref
@@ -323,15 +298,6 @@ pub struct RWLockReadGuard<'a, T:'a> {
     _guard: raw::RWLockReadGuard<'a>,
 }
 
-/// Stage0 only
-#[cfg(stage0)]
-pub struct RWLockReadGuard<'a, T> {
-    // FIXME #12808: strange names to try to avoid interfering with
-    // field accesses of the contained type via Deref
-    _data: &'a T,
-    _guard: raw::RWLockReadGuard<'a>,
-}
-
 impl<T: Send + Sync> RWLock<T> {
     /// Create a reader/writer lock with the supplied data.
     pub fn new(user_data: T) -> RWLock<T> {
diff --git a/src/libsync/raw.rs b/src/libsync/raw.rs
index 245a7666a64..b259eb7e579 100644
--- a/src/libsync/raw.rs
+++ b/src/libsync/raw.rs
@@ -103,13 +103,6 @@ struct SemInner<Q> {
 }
 
 #[must_use]
-#[cfg(stage0)]
-struct SemGuard<'a, Q> {
-    sem: &'a Sem<Q>,
-}
-
-#[must_use]
-#[cfg(not(stage0))]
 struct SemGuard<'a, Q:'a> {
     sem: &'a Sem<Q>,
 }