OpenE2K/rust
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fallout in libstd: remove impls now considered to conflict.

Browse Source
This commit is contained in:
Niko Matsakis 2015-03-30 17:50:31 -04:00
parent b0af587b64
commit 30b2d9e764
4 changed files with 12 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/liballoc/boxed.rs
View File

@ -278,13 +278,6 @@ impl<T: fmt::Debug + ?Sized> fmt::Debug for Box<T> {
} }
} }
#[stable(feature = "rust1", since = "1.0.0")]
impl fmt::Debug for Box<Any> {
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
f.pad("Box<Any>")
}
}
#[stable(feature = "rust1", since = "1.0.0")] #[stable(feature = "rust1", since = "1.0.0")]
impl<T: ?Sized> Deref for Box<T> { impl<T: ?Sized> Deref for Box<T> {
type Target = T; type Target = T;

8
src/liballoc/boxed_test.rs
View File

@ -55,17 +55,17 @@ fn test_show() {
let b = Box::new(Test) as Box<Any>; let b = Box::new(Test) as Box<Any>;
let a_str = format!("{:?}", a); let a_str = format!("{:?}", a);
let b_str = format!("{:?}", b); let b_str = format!("{:?}", b);
assert_eq!(a_str, "Box<Any>"); assert_eq!(a_str, "Any");
assert_eq!(b_str, "Box<Any>"); assert_eq!(b_str, "Any");
static EIGHT: usize = 8; static EIGHT: usize = 8;
static TEST: Test = Test; static TEST: Test = Test;
let a = &EIGHT as &Any; let a = &EIGHT as &Any;
let b = &TEST as &Any; let b = &TEST as &Any;
let s = format!("{:?}", a); let s = format!("{:?}", a);
assert_eq!(s, "&Any"); assert_eq!(s, "Any");
let s = format!("{:?}", b); let s = format!("{:?}", b);
assert_eq!(s, "&Any"); assert_eq!(s, "Any");
} }
#[test] #[test]

8
src/libcore/any.rs
View File

@ -71,6 +71,7 @@
#![stable(feature = "rust1", since = "1.0.0")] #![stable(feature = "rust1", since = "1.0.0")]
use fmt;
use marker::Send; use marker::Send;
use mem::transmute; use mem::transmute;
use option::Option::{self, Some, None}; use option::Option::{self, Some, None};
@ -105,6 +106,13 @@ impl<T> Any for T
// Extension methods for Any trait objects. // 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 { impl Any {
/// Returns true if the boxed type is the same as `T` /// Returns true if the boxed type is the same as `T`
#[stable(feature = "rust1", since = "1.0.0")] #[stable(feature = "rust1", since = "1.0.0")]

6
src/libcore/fmt/mod.rs
View File

@ -12,7 +12,6 @@
#![stable(feature = "rust1", since = "1.0.0")] #![stable(feature = "rust1", since = "1.0.0")]
use any;
use cell::{Cell, RefCell, Ref, RefMut, BorrowState}; use cell::{Cell, RefCell, Ref, RefMut, BorrowState};
use char::CharExt; use char::CharExt;
use iter::Iterator; use iter::Iterator;
@ -997,11 +996,6 @@ macro_rules! tuple {
tuple! { T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, } 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")] #[stable(feature = "rust1", since = "1.0.0")]
impl<T: Debug> Debug for [T] { impl<T: Debug> Debug for [T] {
fn fmt(&self, f: &mut Formatter) -> Result { fn fmt(&self, f: &mut Formatter) -> Result {