Skip to content

Commit

Permalink
auto merge of rust-lang#12405 : kud1ing/rust/backticks, r=huonw
Browse files Browse the repository at this point in the history
  • Loading branch information
bors committed Feb 20, 2014
2 parents 06e1281 + 4ad5751 commit 1366e04
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion src/librustc/middle/mem_categorization.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1152,7 +1152,7 @@ impl<TYPER:Typer> MemCategorizationContext<TYPER> {
format!("captured outer variable")
}
_ => {
format!("dereference of {} pointer", ptr_sigil(pk))
format!("dereference of `{}`-pointer", ptr_sigil(pk))
}
}
}
Expand Down
6 changes: 3 additions & 3 deletions src/test/compile-fail/borrowck-move-in-irrefut-pat.rs
Original file line number Diff line number Diff line change
Expand Up @@ -11,16 +11,16 @@
fn with(f: |&~str|) {}

fn arg_item(&_x: &~str) {}
//~^ ERROR cannot move out of dereference of & pointer
//~^ ERROR cannot move out of dereference of `&`-pointer

fn arg_closure() {
with(|&_x| ())
//~^ ERROR cannot move out of dereference of & pointer
//~^ ERROR cannot move out of dereference of `&`-pointer
}

fn let_pat() {
let &_x = &~"hi";
//~^ ERROR cannot move out of dereference of & pointer
//~^ ERROR cannot move out of dereference of `&`-pointer
}

pub fn main() {}
4 changes: 2 additions & 2 deletions src/test/compile-fail/borrowck-move-out-of-vec-tail.rs
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@ pub fn main() {
[_, ..tail] => {
match tail {
[Foo { string: a }, Foo { string: b }] => {
//~^ ERROR cannot move out of dereference of & pointer
//~^^ ERROR cannot move out of dereference of & pointer
//~^ ERROR cannot move out of dereference of `&`-pointer
//~^^ ERROR cannot move out of dereference of `&`-pointer
}
_ => {
unreachable!();
Expand Down
2 changes: 1 addition & 1 deletion src/test/compile-fail/issue-2590.rs
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ trait parse {

impl parse for parser {
fn parse(&self) -> ~[int] {
self.tokens //~ ERROR cannot move out of dereference of & pointer
self.tokens //~ ERROR cannot move out of dereference of `&`-pointer
}
}

Expand Down

0 comments on commit 1366e04

Please sign in to comment.