OpenE2K
/
rust
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fmt: Assume that we'll only ever see 32 or 64 bit pointers

This commit is contained in:
Richo Healey 2015-04-09 18:06:01 -07:00
parent d8bb08037f
commit 64da4e171d
3 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/libcore/fmt/mod.rs
View File

@ -861,8 +861,7 @@ impl<T> Pointer for *const T {
// The formats need two extra bytes, for the 0x
if cfg!(target_pointer_width = "32") {
f.width = Some(10);
}
if cfg!(target_pointer_width = "64") {
} else {
f.width = Some(18);
}
}

3
src/test/run-pass/fmt-pointer-trait.rs
View File

@ -26,8 +26,7 @@ fn main() {
if cfg!(target_pointer_width = "32") {
assert_eq!(format!("{:#p}", p),
"0x00000000");
}
if cfg!(target_pointer_width = "64") {
} else {
assert_eq!(format!("{:#p}", p),
"0x0000000000000000");
}

3
src/test/run-pass/ifmt.rs
View File

@ -75,8 +75,7 @@ pub fn main() {
if cfg!(target_pointer_width = "32") {
t!(format!("{:#p}", 0x1234 as *const isize), "0x00001234");
t!(format!("{:#p}", 0x1234 as *mut isize), "0x00001234");
}
if cfg!(target_pointer_width = "64") {
} else {
t!(format!("{:#p}", 0x1234 as *const isize), "0x0000000000001234");
t!(format!("{:#p}", 0x1234 as *mut isize), "0x0000000000001234");
}