---

yaml
---
r: 171481
b: refs/heads/batch
c: 24ccb34
h: refs/heads/master
i:
  171479: 1c8f53d
v: v3

Author: alexcrichton

[refs]

@@ -29,7 +29,7 @@ refs/tags/0.12.0: f0c419429ef30723ceaf6b42f9b5a2aeb5d2e2d1
 refs/heads/issue-18208-method-dispatch-2: 9e1eae4fb9b6527315b4441cf8a0f5ca911d1671
 refs/heads/automation-fail: 1bf06495443584539b958873e04cc2f864ab10e4
 refs/heads/issue-18208-method-dispatch-3-quick-reject: 2009f85b9f99dedcec4404418eda9ddba90258a2
-refs/heads/batch: 56a9e2fcd5f0b737df81a39b22f72a55c95b44a2
+refs/heads/batch: 24ccb34266c93a21b4cd1bef473c56087689c079
 refs/heads/building: 126db549b038c84269a1e4fe46f051b2c15d6970
 refs/heads/beta: 496dc4eae7de9d14cd49511a9acfbf5f11ae6c3f
 refs/heads/windistfix: 7608dbad651f02e837ed05eef3d74a6662a6e928

branches/batch/src/libcore/intrinsics.rs

@@ -42,9 +42,6 @@
 #![experimental]
 #![allow(missing_docs)]
 
-#[cfg(not(stage0))]
-use marker::Sized;
-
 pub type GlueFn = extern "Rust" fn(*const i8);
 
 #[lang="ty_desc"]
@@ -203,9 +200,6 @@ extern "rust-intrinsic" {
     /// Gets an identifier which is globally unique to the specified type. This
     /// function will return the same value for a type regardless of whichever
     /// crate it is invoked in.
-    #[cfg(not(stage0))]
-    pub fn type_id<T: ?Sized + 'static>() -> TypeId;
-    #[cfg(stage0)]
     pub fn type_id<T: 'static>() -> TypeId;
 
     /// Create a value initialized to zero.
@@ -556,19 +550,9 @@ pub struct TypeId {
 }
 
 impl TypeId {
-    /// Returns the `TypeId` of the type this generic function has been
-    /// instantiated with
-    #[cfg(stage0)]
+    /// Returns the `TypeId` of the type this generic function has been instantiated with
     pub fn of<T: 'static>() -> TypeId {
         unsafe { type_id::<T>() }
     }
-
-    /// Returns the `TypeId` of the type this generic function has been
-    /// instantiated with
-    #[cfg(not(stage0))]
-    pub fn of<T: ?Sized + 'static>() -> TypeId {
-        unsafe { type_id::<T>() }
-    }
-
     pub fn hash(&self) -> u64 { self.t }
 }