3cb9fa26ef
This commit is an implementation of [RFC 565][rfc] which is a stabilization of the `std::fmt` module and the implementations of various formatting traits. Specifically, the following changes were performed: [rfc]: https://github.com/rust-lang/rfcs/blob/master/text/0565-show-string-guidelines.md * The `Show` trait is now deprecated, it was renamed to `Debug` * The `String` trait is now deprecated, it was renamed to `Display` * Many `Debug` and `Display` implementations were audited in accordance with the RFC and audited implementations now have the `#[stable]` attribute * Integers and floats no longer print a suffix * Smart pointers no longer print details that they are a smart pointer * Paths with `Debug` are now quoted and escape characters * The `unwrap` methods on `Result` now require `Display` instead of `Debug` * The `Error` trait no longer has a `detail` method and now requires that `Display` must be implemented. With the loss of `String`, this has moved into libcore. * `impl<E: Error> FromError<E> for Box<Error>` now exists * `derive(Show)` has been renamed to `derive(Debug)`. This is not currently warned about due to warnings being emitted on stage1+ While backwards compatibility is attempted to be maintained with a blanket implementation of `Display` for the old `String` trait (and the same for `Show`/`Debug`) this is still a breaking change due to primitives no longer implementing `String` as well as modifications such as `unwrap` and the `Error` trait. Most code is fairly straightforward to update with a rename or tweaks of method calls. [breaking-change] Closes #21436
72 lines
1.8 KiB
Rust
72 lines
1.8 KiB
Rust
// Copyright 2012-2015 The Rust Project Developers. See the COPYRIGHT
|
|
// file at the top-level directory of this distribution and at
|
|
// http://rust-lang.org/COPYRIGHT.
|
|
//
|
|
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
|
|
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
|
|
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
|
|
// option. This file may not be copied, modified, or distributed
|
|
// except according to those terms.
|
|
|
|
// Issue #2303
|
|
|
|
#![feature(intrinsics)]
|
|
|
|
use std::mem;
|
|
|
|
mod rusti {
|
|
extern "rust-intrinsic" {
|
|
pub fn pref_align_of<T>() -> uint;
|
|
pub fn min_align_of<T>() -> uint;
|
|
}
|
|
}
|
|
|
|
// This is the type with the questionable alignment
|
|
#[derive(Debug)]
|
|
struct Inner {
|
|
c64: u32
|
|
}
|
|
|
|
// This is the type that contains the type with the
|
|
// questionable alignment, for testing
|
|
#[derive(Debug)]
|
|
struct Outer {
|
|
c8: u8,
|
|
t: Inner
|
|
}
|
|
|
|
|
|
#[cfg(any(target_arch = "x86", target_arch = "arm", target_arch = "aarch64"))]
|
|
mod m {
|
|
pub fn align() -> uint { 4u }
|
|
pub fn size() -> uint { 8u }
|
|
}
|
|
|
|
#[cfg(target_arch = "x86_64")]
|
|
mod m {
|
|
pub fn align() -> uint { 4u }
|
|
pub fn size() -> uint { 8u }
|
|
}
|
|
|
|
pub fn main() {
|
|
unsafe {
|
|
let x = Outer {c8: 22u8, t: Inner {c64: 44u32}};
|
|
|
|
// Send it through the shape code
|
|
let y = format!("{:?}", x);
|
|
|
|
println!("align inner = {:?}", rusti::min_align_of::<Inner>());
|
|
println!("size outer = {:?}", mem::size_of::<Outer>());
|
|
println!("y = {:?}", y);
|
|
|
|
// per clang/gcc the alignment of `inner` is 4 on x86.
|
|
assert_eq!(rusti::min_align_of::<Inner>(), m::align());
|
|
|
|
// per clang/gcc the size of `outer` should be 12
|
|
// because `inner`s alignment was 4.
|
|
assert_eq!(mem::size_of::<Outer>(), m::size());
|
|
|
|
assert_eq!(y, "Outer { c8: 22, t: Inner { c64: 44 } }".to_string());
|
|
}
|
|
}
|