diff options
| author | bors <bors@rust-lang.org> | 2015-03-01 06:32:54 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2015-03-01 06:32:54 +0000 |
| commit | 0905c8a5ec856a6b972fcb239df2b8f6e82d2418 (patch) | |
| tree | dae5d3ebde7eaaeeaad8b0e67bfb835b33fb5258 /src/libcore | |
| parent | 341a9ca1e324d7b7427334b32e99e6d8bc82e9a6 (diff) | |
| parent | 60f7732ccd9b0ad50490457ddd02a4a48cf74e74 (diff) | |
| download | rust-0905c8a5ec856a6b972fcb239df2b8f6e82d2418.tar.gz rust-0905c8a5ec856a6b972fcb239df2b8f6e82d2418.zip | |
Auto merge of #22909 - Manishearth:rollup, r=Manishearth
r? @Manishearth
Diffstat (limited to 'src/libcore')
| -rw-r--r-- | src/libcore/fmt/mod.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libcore/fmt/mod.rs b/src/libcore/fmt/mod.rs index 117b829fdff..9544fbaa55b 100644 --- a/src/libcore/fmt/mod.rs +++ b/src/libcore/fmt/mod.rs @@ -700,7 +700,7 @@ impl Display for char { impl<T> Pointer for *const T { fn fmt(&self, f: &mut Formatter) -> Result { f.flags |= 1 << (FlagV1::Alternate as u32); - let ret = LowerHex::fmt(&(*self as u32), f); + let ret = LowerHex::fmt(&(*self as usize), f); f.flags &= !(1 << (FlagV1::Alternate as u32)); ret } |