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/liballoc | |
| parent | b0af587b64786b45ac9651ee4608e1edbd53a733 (diff) | |
| download | rust-30b2d9e7643de3a267029c2763edb0b44ff2396e.tar.gz rust-30b2d9e7643de3a267029c2763edb0b44ff2396e.zip | |
Fallout in libstd: remove impls now considered to conflict.
Diffstat (limited to 'src/liballoc')
| -rw-r--r-- | src/liballoc/boxed.rs | 7 | ||||
| -rw-r--r-- | src/liballoc/boxed_test.rs | 8 |
2 files changed, 4 insertions, 11 deletions
diff --git a/src/liballoc/boxed.rs b/src/liballoc/boxed.rs index adfe0f461be..c4541e34cdb 100644 --- a/src/liballoc/boxed.rs +++ b/src/liballoc/boxed.rs @@ -279,13 +279,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")] impl<T: ?Sized> Deref for Box<T> { type Target = T; diff --git a/src/liballoc/boxed_test.rs b/src/liballoc/boxed_test.rs index 682d5f407c4..fc44ac4eac6 100644 --- a/src/liballoc/boxed_test.rs +++ b/src/liballoc/boxed_test.rs @@ -55,17 +55,17 @@ fn test_show() { let b = Box::new(Test) as Box<Any>; let a_str = format!("{:?}", a); let b_str = format!("{:?}", b); - assert_eq!(a_str, "Box<Any>"); - assert_eq!(b_str, "Box<Any>"); + assert_eq!(a_str, "Any"); + assert_eq!(b_str, "Any"); static EIGHT: usize = 8; static TEST: Test = Test; let a = &EIGHT as &Any; let b = &TEST as &Any; let s = format!("{:?}", a); - assert_eq!(s, "&Any"); + assert_eq!(s, "Any"); let s = format!("{:?}", b); - assert_eq!(s, "&Any"); + assert_eq!(s, "Any"); } #[test] |