nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2024-11-26 00:34:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Auto merge of #70833 - RalfJung:rustc-layout, r=Centril

Browse Source 
tweak rustc_layout debug output

As suggested by r? @eddyb @Centril
This commit is contained in:
bors 2020-04-06 08:12:30 +00:00
commit 733f104f13
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/librustc_passes/layout_test.rs
View File

@ -85,7 +85,7 @@ impl LayoutTest<'tcx> {
sym::debug => { sym::debug => {
self.tcx.sess.span_err( self.tcx.sess.span_err(
item.span, item.span,
&format!("layout debugging for type {:?}: {:#?}", ty, *ty_layout), &format!("layout_of({:?}) = {:#?}", ty, *ty_layout),
); );
} }

10
src/test/ui/layout/debug.rs
View File

@ -3,19 +3,19 @@
#![crate_type = "lib"] #![crate_type = "lib"]
#[rustc_layout(debug)] #[rustc_layout(debug)]
enum E { Foo, Bar(!, i32, i32) } //~ ERROR: layout debugging enum E { Foo, Bar(!, i32, i32) } //~ ERROR: layout_of
#[rustc_layout(debug)] #[rustc_layout(debug)]
struct S { f1: i32, f2: (), f3: i32 } //~ ERROR: layout debugging struct S { f1: i32, f2: (), f3: i32 } //~ ERROR: layout_of
#[rustc_layout(debug)] #[rustc_layout(debug)]
union U { f1: (i32, i32), f3: i32 } //~ ERROR: layout debugging union U { f1: (i32, i32), f3: i32 } //~ ERROR: layout_of
#[rustc_layout(debug)] #[rustc_layout(debug)]
type Test = Result<i32, i32>; //~ ERROR: layout debugging type Test = Result<i32, i32>; //~ ERROR: layout_of
#[rustc_layout(debug)] #[rustc_layout(debug)]
type T = impl std::fmt::Debug; //~ ERROR: layout debugging type T = impl std::fmt::Debug; //~ ERROR: layout_of
fn f() -> T { fn f() -> T {
0i32 0i32

10
src/test/ui/layout/debug.stderr
View File

@ -1,4 +1,4 @@
error: layout debugging for type E: Layout { error: layout_of(E) = Layout {
fields: Arbitrary { fields: Arbitrary {
offsets: [ offsets: [
Size { Size {
@ -110,7 +110,7 @@ error: layout debugging for type E: Layout {
LL | enum E { Foo, Bar(!, i32, i32) } LL | enum E { Foo, Bar(!, i32, i32) }
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
error: layout debugging for type S: Layout { error: layout_of(S) = Layout {
fields: Arbitrary { fields: Arbitrary {
offsets: [ offsets: [
Size { Size {
@ -164,7 +164,7 @@ error: layout debugging for type S: Layout {
LL | struct S { f1: i32, f2: (), f3: i32 } LL | struct S { f1: i32, f2: (), f3: i32 }
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
error: layout debugging for type U: Layout { error: layout_of(U) = Layout {
fields: Union( fields: Union(
2, 2,
), ),
@ -190,7 +190,7 @@ error: layout debugging for type U: Layout {
LL | union U { f1: (i32, i32), f3: i32 } LL | union U { f1: (i32, i32), f3: i32 }
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
error: layout debugging for type std::result::Result<i32, i32>: Layout { error: layout_of(std::result::Result<i32, i32>) = Layout {
fields: Arbitrary { fields: Arbitrary {
offsets: [ offsets: [
Size { Size {
@ -315,7 +315,7 @@ error: layout debugging for type std::result::Result<i32, i32>: Layout {
LL | type Test = Result<i32, i32>; LL | type Test = Result<i32, i32>;
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
error: layout debugging for type i32: Layout { error: layout_of(i32) = Layout {
fields: Union( fields: Union(
0, 0,
), ),