Skip to content

Commit e7b58d8

Browse files
committed
---
yaml --- r: 170982 b: refs/heads/try c: 24ccb34 h: refs/heads/master v: v3
1 parent 5302281 commit e7b58d8

File tree

2 files changed

+2
-18
lines changed

2 files changed

+2
-18
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
refs/heads/master: 73a25f55ad748b4d3516417c711b99ce446591af
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
44
refs/heads/snap-stage3: 5b3cd3900ceda838f5798c30ab96ceb41f962534
5-
refs/heads/try: 56a9e2fcd5f0b737df81a39b22f72a55c95b44a2
5+
refs/heads/try: 24ccb34266c93a21b4cd1bef473c56087689c079
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
88
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596

branches/try/src/libcore/intrinsics.rs

Lines changed: 1 addition & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,6 @@
4242
#![experimental]
4343
#![allow(missing_docs)]
4444

45-
#[cfg(not(stage0))]
46-
use marker::Sized;
47-
4845
pub type GlueFn = extern "Rust" fn(*const i8);
4946

5047
#[lang="ty_desc"]
@@ -203,9 +200,6 @@ extern "rust-intrinsic" {
203200
/// Gets an identifier which is globally unique to the specified type. This
204201
/// function will return the same value for a type regardless of whichever
205202
/// crate it is invoked in.
206-
#[cfg(not(stage0))]
207-
pub fn type_id<T: ?Sized + 'static>() -> TypeId;
208-
#[cfg(stage0)]
209203
pub fn type_id<T: 'static>() -> TypeId;
210204

211205
/// Create a value initialized to zero.
@@ -556,19 +550,9 @@ pub struct TypeId {
556550
}
557551

558552
impl TypeId {
559-
/// Returns the `TypeId` of the type this generic function has been
560-
/// instantiated with
561-
#[cfg(stage0)]
553+
/// Returns the `TypeId` of the type this generic function has been instantiated with
562554
pub fn of<T: 'static>() -> TypeId {
563555
unsafe { type_id::<T>() }
564556
}
565-
566-
/// Returns the `TypeId` of the type this generic function has been
567-
/// instantiated with
568-
#[cfg(not(stage0))]
569-
pub fn of<T: ?Sized + 'static>() -> TypeId {
570-
unsafe { type_id::<T>() }
571-
}
572-
573557
pub fn hash(&self) -> u64 { self.t }
574558
}

0 commit comments

Comments
 (0)