diff options
| author | bors <bors@rust-lang.org> | 2018-01-06 20:41:33 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2018-01-06 20:41:33 +0000 |
| commit | 6828cf90146c7fefc4ba4f16dffe75f763f2d910 (patch) | |
| tree | 44e745909b8c8bfc2808bacc08f5aeee4916e65e /src/test | |
| parent | 72176cf96cb79a0ebf62972b76dbe68c933bef4d (diff) | |
| parent | ce701061384bae7c3b9873460c1c5df8204431fc (diff) | |
Auto merge of #47235 - kennytm:rollup, r=kennytm
Rollup of 7 pull requests - Successful merges: #46947, #47170, #47190, #47205, #47217, #47220, #47230 - Failed merges: #47233
Diffstat (limited to 'src/test')
| -rw-r--r-- | src/test/debuginfo/shadowed-variable.rs | 17 | ||||
| -rw-r--r-- | src/test/ui/fat-ptr-cast.stderr | 6 |
2 files changed, 14 insertions, 9 deletions
diff --git a/src/test/debuginfo/shadowed-variable.rs b/src/test/debuginfo/shadowed-variable.rs index 5d3026734c1..6e4d94d26cd 100644 --- a/src/test/debuginfo/shadowed-variable.rs +++ b/src/test/debuginfo/shadowed-variable.rs @@ -9,7 +9,6 @@ // except according to those terms. // min-lldb-version: 310 -// ignore-test // Test temporarily ignored due to debuginfo tests being disabled, see PR 47155 // compile-flags:-g // === GDB TESTS =================================================================================== @@ -35,15 +34,15 @@ // gdb-command:continue // gdb-command:print x -// gdb-check:$5 = 10.5 +// gdb-check:$7 = 10.5 // gdb-command:print y -// gdb-check:$6 = 20 +// gdb-check:$8 = 20 // gdb-command:continue // gdb-command:print x -// gdb-check:$5 = 11.5 +// gdb-check:$9 = 11.5 // gdb-command:print y -// gdb-check:$6 = 20 +// gdb-check:$10 = 20 // gdb-command:continue // === LLDB TESTS ================================================================================== @@ -69,15 +68,15 @@ // lldb-command:continue // lldb-command:print x -// lldb-check:[...]$4 = 10.5 +// lldb-check:[...]$6 = 10.5 // lldb-command:print y -// lldb-check:[...]$5 = 20 +// lldb-check:[...]$7 = 20 // lldb-command:continue // lldb-command:print x -// lldb-check:[...]$4 = 11.5 +// lldb-check:[...]$8 = 11.5 // lldb-command:print y -// lldb-check:[...]$5 = 20 +// lldb-check:[...]$9 = 20 // lldb-command:continue #![feature(omit_gdb_pretty_printer_section)] diff --git a/src/test/ui/fat-ptr-cast.stderr b/src/test/ui/fat-ptr-cast.stderr index 35a97749e00..b3c2b23cd32 100644 --- a/src/test/ui/fat-ptr-cast.stderr +++ b/src/test/ui/fat-ptr-cast.stderr @@ -11,18 +11,24 @@ error[E0606]: casting `&[i32]` as `isize` is invalid | 21 | a as isize; //~ ERROR casting | ^^^^^^^^^^ + | + = help: cast through a raw pointer first error[E0606]: casting `&[i32]` as `i16` is invalid --> $DIR/fat-ptr-cast.rs:22:5 | 22 | a as i16; //~ ERROR casting `&[i32]` as `i16` is invalid | ^^^^^^^^ + | + = help: cast through a raw pointer first error[E0606]: casting `&[i32]` as `u32` is invalid --> $DIR/fat-ptr-cast.rs:23:5 | 23 | a as u32; //~ ERROR casting `&[i32]` as `u32` is invalid | ^^^^^^^^ + | + = help: cast through a raw pointer first error[E0605]: non-primitive cast: `std::boxed::Box<[i32]>` as `usize` --> $DIR/fat-ptr-cast.rs:24:5 |