Skip to content

Commit 5c5f752

Browse files
author
Ariel Ben-Yehuda
committed
fix test fallout
1 parent eeedc14 commit 5c5f752

File tree

4 files changed

+7
-7
lines changed

4 files changed

+7
-7
lines changed

src/test/compile-fail/borrowck/borrowck-move-out-of-vec-tail.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ pub fn main() {
2828
[_, ref tail..] => {
2929
match tail {
3030
&[Foo { string: a },
31-
//~^ ERROR cannot move out of borrowed content
31+
//~^ ERROR cannot move out of type `[Foo]`
3232
//~| cannot move out
3333
//~| to prevent move
3434
Foo { string: b }] => {

src/test/compile-fail/borrowck/borrowck-vec-pattern-nesting.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ fn c() {
4040
let mut vec = vec!(box 1, box 2, box 3);
4141
let vec: &mut [Box<isize>] = &mut vec;
4242
match vec {
43-
&mut [_a, //~ ERROR cannot move out of borrowed content
43+
&mut [_a, //~ ERROR cannot move out
4444
//~| cannot move out
4545
//~| to prevent move
4646
..

src/test/compile-fail/issue-12567.rs

+4-4
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,12 @@ fn match_vecs<'a, T>(l1: &'a [T], l2: &'a [T]) {
1515
(&[], &[]) => println!("both empty"),
1616
(&[], &[hd, ..]) | (&[hd, ..], &[])
1717
=> println!("one empty"),
18-
//~^^ ERROR: cannot move out of borrowed content
19-
//~^^^ ERROR: cannot move out of borrowed content
18+
//~^^ ERROR: cannot move out of type `[T]`, a non-copy array
19+
//~^^^ ERROR: cannot move out of type `[T]`, a non-copy array
2020
(&[hd1, ..], &[hd2, ..])
2121
=> println!("both nonempty"),
22-
//~^^ ERROR: cannot move out of borrowed content
23-
//~^^^ ERROR: cannot move out of borrowed content
22+
//~^^ ERROR: cannot move out of type `[T]`, a non-copy array
23+
//~^^^ ERROR: cannot move out of type `[T]`, a non-copy array
2424
}
2525
}
2626

src/test/compile-fail/mir-dataflow/uninits-2.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ struct S(i32);
2323
fn foo(x: &mut S) {
2424
// `x` is initialized here, so maybe-uninit bit is 0.
2525

26-
unsafe { *rustc_peek(&x) }; //~ ERROR rustc_peek: bit not set
26+
unsafe { rustc_peek(&x) }; //~ ERROR rustc_peek: bit not set
2727

2828
::std::mem::drop(x);
2929

0 commit comments

Comments
 (0)