diff options
| author | Niko Matsakis <niko@alum.mit.edu> | 2015-03-30 17:50:31 -0400 |
|---|---|---|
| committer | Niko Matsakis <niko@alum.mit.edu> | 2015-04-01 11:21:42 -0400 |
| commit | 30b2d9e7643de3a267029c2763edb0b44ff2396e (patch) | |
| tree | 2add92cdb4fe9f4bdc7acdd8003130ddb2aacdb8 /src/libcore | |
| parent | b0af587b64786b45ac9651ee4608e1edbd53a733 (diff) | |
| download | rust-30b2d9e7643de3a267029c2763edb0b44ff2396e.tar.gz rust-30b2d9e7643de3a267029c2763edb0b44ff2396e.zip | |
Fallout in libstd: remove impls now considered to conflict.
Diffstat (limited to 'src/libcore')
| -rw-r--r-- | src/libcore/any.rs | 8 | ||||
| -rw-r--r-- | src/libcore/fmt/mod.rs | 6 |
2 files changed, 8 insertions, 6 deletions
diff --git a/src/libcore/any.rs b/src/libcore/any.rs index 0ffc4a229b5..320fdd50b35 100644 --- a/src/libcore/any.rs +++ b/src/libcore/any.rs @@ -71,6 +71,7 @@ #![stable(feature = "rust1", since = "1.0.0")] +use fmt; use marker::Send; use mem::transmute; use option::Option::{self, Some, None}; @@ -105,6 +106,13 @@ impl<T> Any for T // Extension methods for Any trait objects. /////////////////////////////////////////////////////////////////////////////// +#[stable(feature = "rust1", since = "1.0.0")] +impl fmt::Debug for Any { + fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { + f.pad("Any") + } +} + impl Any { /// Returns true if the boxed type is the same as `T` #[stable(feature = "rust1", since = "1.0.0")] diff --git a/src/libcore/fmt/mod.rs b/src/libcore/fmt/mod.rs index ffb358cdac8..3f8bbeb1feb 100644 --- a/src/libcore/fmt/mod.rs +++ b/src/libcore/fmt/mod.rs @@ -12,7 +12,6 @@ #![stable(feature = "rust1", since = "1.0.0")] -use any; use cell::{Cell, RefCell, Ref, RefMut, BorrowState}; use char::CharExt; use iter::Iterator; @@ -998,11 +997,6 @@ macro_rules! tuple { tuple! { T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, } #[stable(feature = "rust1", since = "1.0.0")] -impl<'a> Debug for &'a (any::Any+'a) { - fn fmt(&self, f: &mut Formatter) -> Result { f.pad("&Any") } -} - -#[stable(feature = "rust1", since = "1.0.0")] impl<T: Debug> Debug for [T] { fn fmt(&self, f: &mut Formatter) -> Result { self.iter().fold(f.debug_list(), |b, e| b.entry(e)).finish() |