about summary refs log tree commit diff
path: root/src/libcore
diff options
context:
space:
mode:
authorManish Goregaokar <manishsmail@gmail.com>2015-03-01 01:19:05 +0530
committerManish Goregaokar <manishsmail@gmail.com>2015-03-01 09:49:43 +0530
commit87391ed52ac7fcd00dbb710e3feb2388cc143b58 (patch)
treebea5eba1a8bbee735bb2c602c8e6cddff773ce01 /src/libcore
parent3c1f61ce63e911698666c7da1bbf21cdc9818a84 (diff)
parentc22d026326f10f8a4e60d49c6fbf37de3c970a78 (diff)
downloadrust-87391ed52ac7fcd00dbb710e3feb2388cc143b58.tar.gz
rust-87391ed52ac7fcd00dbb710e3feb2388cc143b58.zip
Rollup merge of #22901 - thepowersgang:patch-1, r=eddyb
 A misplaced uint->u32 instead of usize in fmt::Pointer. Added a basic test.
Diffstat (limited to 'src/libcore')
-rw-r--r--src/libcore/fmt/mod.rs2
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
     }