diff options
| author | Patrick Walton <pcwalton@mimiga.net> | 2013-08-19 17:24:04 -0700 |
|---|---|---|
| committer | Patrick Walton <pcwalton@mimiga.net> | 2013-08-27 18:47:57 -0700 |
| commit | 4f32a2d8540cc7534270be3a0aa33b830534a67b (patch) | |
| tree | 5eb9fcf39e8d43b19ab1ee030fb4802800d62d76 /src/libstd | |
| parent | 5c9f5ec3975d54b59d3d4813063f87fb3f41d3f6 (diff) | |
| download | rust-4f32a2d8540cc7534270be3a0aa33b830534a67b.tar.gz rust-4f32a2d8540cc7534270be3a0aa33b830534a67b.zip | |
librustc: Fix merge fallout.
Diffstat (limited to 'src/libstd')
| -rw-r--r-- | src/libstd/fmt/mod.rs | 8 |
1 files changed, 6 insertions, 2 deletions
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<T> Default for *const T { - fn fmt(me: &*const T, f: &mut Formatter) { Pointer::fmt(me, f) } +impl<T> Default for *T { + fn fmt(me: &*T, f: &mut Formatter) { Pointer::fmt(me, f) } +} + +impl<T> 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, |