Skip to content

Commit

Permalink
fix test fallout
Browse files Browse the repository at this point in the history
  • Loading branch information
Ariel Ben-Yehuda committed Sep 16, 2016
1 parent eeedc14 commit 5c5f752
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 7 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ pub fn main() {
[_, ref tail..] => {
match tail {
&[Foo { string: a },
//~^ ERROR cannot move out of borrowed content
//~^ ERROR cannot move out of type `[Foo]`
//~| cannot move out
//~| to prevent move
Foo { string: b }] => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ fn c() {
let mut vec = vec!(box 1, box 2, box 3);
let vec: &mut [Box<isize>] = &mut vec;
match vec {
&mut [_a, //~ ERROR cannot move out of borrowed content
&mut [_a, //~ ERROR cannot move out
//~| cannot move out
//~| to prevent move
..
Expand Down
8 changes: 4 additions & 4 deletions src/test/compile-fail/issue-12567.rs
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,12 @@ fn match_vecs<'a, T>(l1: &'a [T], l2: &'a [T]) {
(&[], &[]) => println!("both empty"),
(&[], &[hd, ..]) | (&[hd, ..], &[])
=> println!("one empty"),
//~^^ ERROR: cannot move out of borrowed content
//~^^^ ERROR: cannot move out of borrowed content
//~^^ ERROR: cannot move out of type `[T]`, a non-copy array
//~^^^ ERROR: cannot move out of type `[T]`, a non-copy array
(&[hd1, ..], &[hd2, ..])
=> println!("both nonempty"),
//~^^ ERROR: cannot move out of borrowed content
//~^^^ ERROR: cannot move out of borrowed content
//~^^ ERROR: cannot move out of type `[T]`, a non-copy array
//~^^^ ERROR: cannot move out of type `[T]`, a non-copy array
}
}

Expand Down
2 changes: 1 addition & 1 deletion src/test/compile-fail/mir-dataflow/uninits-2.rs
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ struct S(i32);
fn foo(x: &mut S) {
// `x` is initialized here, so maybe-uninit bit is 0.

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

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

Expand Down

0 comments on commit 5c5f752

Please sign in to comment.