From 4f32a2d8540cc7534270be3a0aa33b830534a67b Mon Sep 17 00:00:00 2001 From: Patrick Walton Date: Mon, 19 Aug 2013 17:24:04 -0700 Subject: librustc: Fix merge fallout. --- src/libstd/fmt/mod.rs | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'src/libstd') diff --git a/src/libstd/fmt/mod.rs b/src/libstd/fmt/mod.rs index 6d85b968f2a..cdce69f7cd7 100644 --- a/src/libstd/fmt/mod.rs +++ b/src/libstd/fmt/mod.rs @@ -930,8 +930,12 @@ delegate!(float to Float) delegate!(f32 to Float) delegate!(f64 to Float) -impl Default for *const T { - fn fmt(me: &*const T, f: &mut Formatter) { Pointer::fmt(me, f) } +impl Default for *T { + fn fmt(me: &*T, f: &mut Formatter) { Pointer::fmt(me, f) } +} + +impl Default for *mut T { + fn fmt(me: &*mut T, f: &mut Formatter) { Pointer::fmt(me, f) } } // If you expected tests to be here, look instead at the run-pass/ifmt.rs test, -- cgit 1.4.1-3-g733a5