about summary refs log tree commit diff
path: root/src/libcore
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2016-10-01 10:17:20 -0700
committerGitHub <noreply@github.com>2016-10-01 10:17:20 -0700
commitab38d52df75f4fefbecb1156ff96d7c0728cced8 (patch)
tree8aeb0aa2dfd84b33bf7cbad2b9e60a57c7f99ebd /src/libcore
parentdf9fa1a51e9e9570c30b98be2409964313f5d607 (diff)
parent8457ab61f67a463366c3de0e2de177ed5b306434 (diff)
downloadrust-ab38d52df75f4fefbecb1156ff96d7c0728cced8.tar.gz
rust-ab38d52df75f4fefbecb1156ff96d7c0728cced8.zip
Auto merge of #36885 - Manishearth:rollup, r=Manishearth
Rollup of 6 pull requests

- Successful merges: #36865, #36872, #36873, #36877, #36880, #36882
- Failed merges:
Diffstat (limited to 'src/libcore')
-rw-r--r--src/libcore/fmt/mod.rs4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libcore/fmt/mod.rs b/src/libcore/fmt/mod.rs
index a9f53d3abb8..9aba6703386 100644
--- a/src/libcore/fmt/mod.rs
+++ b/src/libcore/fmt/mod.rs
@@ -1566,11 +1566,11 @@ floating! { f64 }
 // Implementation of Display/Debug for various core types
 
 #[stable(feature = "rust1", since = "1.0.0")]
-impl<T> Debug for *const T {
+impl<T: ?Sized> Debug for *const T {
     fn fmt(&self, f: &mut Formatter) -> Result { Pointer::fmt(self, f) }
 }
 #[stable(feature = "rust1", since = "1.0.0")]
-impl<T> Debug for *mut T {
+impl<T: ?Sized> Debug for *mut T {
     fn fmt(&self, f: &mut Formatter) -> Result { Pointer::fmt(self, f) }
 }