Skip to content

Commit d241324

Browse files
committed
---
yaml --- r: 136111 b: refs/heads/auto c: 07cfc25 h: refs/heads/master i: 136109: 48bfdf0 136107: 1bb5db9 136103: 495e7b7 136095: 838b2ee v: v3
1 parent 791d7bc commit d241324

File tree

2 files changed

+3
-8
lines changed

2 files changed

+3
-8
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0
1313
refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
1414
refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
1515
refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
16-
refs/heads/auto: b5ba2f5517b1f90d07969ca3facdf5132e42436c
16+
refs/heads/auto: 07cfc252a1d34b25fcb6c84403071bd183794ae2
1717
refs/heads/servo: af82457af293e2a842ba6b7759b70288da276167
1818
refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c
1919
refs/tags/0.1: b19db808c2793fe2976759b85a355c3ad8c8b336

branches/auto/src/libcore/any.rs

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -91,20 +91,15 @@ pub enum Void { }
9191
/// Every type with no non-`'static` references implements `Any`, so `Any` can
9292
/// be used as a trait object to emulate the effects dynamic typing.
9393
#[stable]
94-
pub trait Any: AnyPrivate + 'static {}
95-
96-
/// An inner trait to ensure that only this module can call `get_type_id()`.
97-
pub trait AnyPrivate {
94+
pub trait Any: 'static {
9895
/// Get the `TypeId` of `self`
9996
fn get_type_id(&self) -> TypeId;
10097
}
10198

102-
impl<T: 'static> AnyPrivate for T {
99+
impl<T: 'static> Any for T {
103100
fn get_type_id(&self) -> TypeId { TypeId::of::<T>() }
104101
}
105102

106-
impl<T: 'static + AnyPrivate> Any for T {}
107-
108103
///////////////////////////////////////////////////////////////////////////////
109104
// Extension methods for Any trait objects.
110105
// Implemented as three extension traits so that the methods can be generic.

0 commit comments

Comments
 (0)