diff options
| author | Ralf Jung <post@ralfj.de> | 2020-04-06 09:22:48 +0200 |
|---|---|---|
| committer | Ralf Jung <post@ralfj.de> | 2020-04-06 09:22:48 +0200 |
| commit | 83fb0b1e8c477ee5b22e309d979e690ed52093ad (patch) | |
| tree | 1161542d2f9217e95d791f025f9dd84fdd8e2267 | |
| parent | af89eb5e5beda2c1de0c0c031694892a51e8db07 (diff) | |
| download | rust-83fb0b1e8c477ee5b22e309d979e690ed52093ad.tar.gz rust-83fb0b1e8c477ee5b22e309d979e690ed52093ad.zip | |
tweak rustc_layout debug output
| -rw-r--r-- | src/librustc_passes/layout_test.rs | 2 | ||||
| -rw-r--r-- | src/test/ui/layout/debug.rs | 10 | ||||
| -rw-r--r-- | src/test/ui/layout/debug.stderr | 10 |
3 files changed, 11 insertions, 11 deletions
diff --git a/src/librustc_passes/layout_test.rs b/src/librustc_passes/layout_test.rs index 22ce909083d..dbc39169f2b 100644 --- a/src/librustc_passes/layout_test.rs +++ b/src/librustc_passes/layout_test.rs @@ -85,7 +85,7 @@ impl LayoutTest<'tcx> { sym::debug => { self.tcx.sess.span_err( item.span, - &format!("layout debugging for type {:?}: {:#?}", ty, *ty_layout), + &format!("layout_of({:?}) = {:#?}", ty, *ty_layout), ); } diff --git a/src/test/ui/layout/debug.rs b/src/test/ui/layout/debug.rs index 034ed3190c1..299151df664 100644 --- a/src/test/ui/layout/debug.rs +++ b/src/test/ui/layout/debug.rs @@ -3,19 +3,19 @@ #![crate_type = "lib"] #[rustc_layout(debug)] -enum E { Foo, Bar(!, i32, i32) } //~ ERROR: layout debugging +enum E { Foo, Bar(!, i32, i32) } //~ ERROR: layout_of #[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)] -union U { f1: (i32, i32), f3: i32 } //~ ERROR: layout debugging +union U { f1: (i32, i32), f3: i32 } //~ ERROR: layout_of #[rustc_layout(debug)] -type Test = Result<i32, i32>; //~ ERROR: layout debugging +type Test = Result<i32, i32>; //~ ERROR: layout_of #[rustc_layout(debug)] -type T = impl std::fmt::Debug; //~ ERROR: layout debugging +type T = impl std::fmt::Debug; //~ ERROR: layout_of fn f() -> T { 0i32 diff --git a/src/test/ui/layout/debug.stderr b/src/test/ui/layout/debug.stderr index 3539cea5ea3..153dec594d3 100644 --- a/src/test/ui/layout/debug.stderr +++ b/src/test/ui/layout/debug.stderr @@ -1,4 +1,4 @@ -error: layout debugging for type E: Layout { +error: layout_of(E) = Layout { fields: Arbitrary { offsets: [ Size { @@ -110,7 +110,7 @@ error: layout debugging for type E: Layout { LL | enum E { Foo, Bar(!, i32, i32) } | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -error: layout debugging for type S: Layout { +error: layout_of(S) = Layout { fields: Arbitrary { offsets: [ Size { @@ -164,7 +164,7 @@ error: layout debugging for type S: Layout { LL | struct S { f1: i32, f2: (), f3: i32 } | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -error: layout debugging for type U: Layout { +error: layout_of(U) = Layout { fields: Union( 2, ), @@ -190,7 +190,7 @@ error: layout debugging for type U: Layout { 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 { offsets: [ Size { @@ -315,7 +315,7 @@ error: layout debugging for type std::result::Result<i32, i32>: Layout { LL | type Test = Result<i32, i32>; | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -error: layout debugging for type i32: Layout { +error: layout_of(i32) = Layout { fields: Union( 0, ), |