Skip to content

Commit 195e680

Browse files
committed
---
yaml --- r: 114670 b: refs/heads/auto c: 8ed728b h: refs/heads/master v: v3
1 parent 4fe785e commit 195e680

File tree

5 files changed

+11
-20
lines changed

5 files changed

+11
-20
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: 85a8e6b80ae91eb00a0bce96a5cec8017e1b37da
16+
refs/heads/auto: 8ed728babb057c0f736a63a69ba772e45278148f
1717
refs/heads/servo: af82457af293e2a842ba6b7759b70288da276167
1818
refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c
1919
refs/tags/0.1: b19db808c2793fe2976759b85a355c3ad8c8b336

branches/auto/src/libstd/any.rs renamed to branches/auto/src/libcore/any.rs

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
//! the extension traits (`*Ext`) for the full details.
2222
2323
use cast::{transmute, transmute_copy};
24-
use fmt;
2524
use option::{Option, Some, None};
2625
use owned::Box;
2726
use raw::TraitObject;
@@ -145,22 +144,6 @@ impl AnyOwnExt for Box<Any> {
145144
}
146145
}
147146

148-
///////////////////////////////////////////////////////////////////////////////
149-
// Trait implementations
150-
///////////////////////////////////////////////////////////////////////////////
151-
152-
impl fmt::Show for Box<Any> {
153-
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
154-
f.pad("Box<Any>")
155-
}
156-
}
157-
158-
impl<'a> fmt::Show for &'a Any {
159-
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
160-
f.pad("&Any")
161-
}
162-
}
163-
164147
#[cfg(test)]
165148
mod tests {
166149
use prelude::*;

branches/auto/src/libcore/lib.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,5 +37,6 @@ pub mod container;
3737

3838
/* Core types and methods on primitives */
3939

40+
pub mod any;
4041
pub mod finally;
4142
pub mod char;

branches/auto/src/libstd/fmt/mod.rs

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1242,6 +1242,14 @@ impl<T> Show for *mut T {
12421242
fn fmt(&self, f: &mut Formatter) -> Result { secret_pointer(self, f) }
12431243
}
12441244

1245+
impl Show for Box<any::Any> {
1246+
fn fmt(&self, f: &mut Formatter) -> Result { f.pad("Box<Any>") }
1247+
}
1248+
1249+
impl<'a> Show for &'a any::Any {
1250+
fn fmt(&self, f: &mut Formatter) -> Result { f.pad("&Any") }
1251+
}
1252+
12451253
impl Show for TypeId {
12461254
fn fmt(&self, f: &mut Formatter) -> Result {
12471255
write!(f.buf, "TypeId \\{ {} \\}", self.hash())

branches/auto/src/libstd/lib.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -137,6 +137,7 @@ extern crate core;
137137
#[cfg(not(test))] pub use ops = core::ops;
138138
#[cfg(not(test))] pub use ty = core::ty;
139139

140+
pub use core::any;
140141
pub use core::cast;
141142
pub use core::char;
142143
pub use core::container;
@@ -218,8 +219,6 @@ pub mod iter;
218219
pub mod to_str;
219220
pub mod clone;
220221
pub mod hash;
221-
pub mod default;
222-
pub mod any;
223222

224223
/* Common data structures */
225224

0 commit comments

Comments
 (0)