Skip to content

Commit 1366e04

Browse files
committed
auto merge of #12405 : kud1ing/rust/backticks, r=huonw
2 parents 06e1281 + 4ad5751 commit 1366e04

File tree

4 files changed

+7
-7
lines changed

4 files changed

+7
-7
lines changed

src/librustc/middle/mem_categorization.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1152,7 +1152,7 @@ impl<TYPER:Typer> MemCategorizationContext<TYPER> {
11521152
format!("captured outer variable")
11531153
}
11541154
_ => {
1155-
format!("dereference of {} pointer", ptr_sigil(pk))
1155+
format!("dereference of `{}`-pointer", ptr_sigil(pk))
11561156
}
11571157
}
11581158
}

src/test/compile-fail/borrowck-move-in-irrefut-pat.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,16 +11,16 @@
1111
fn with(f: |&~str|) {}
1212

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

1616
fn arg_closure() {
1717
with(|&_x| ())
18-
//~^ ERROR cannot move out of dereference of & pointer
18+
//~^ ERROR cannot move out of dereference of `&`-pointer
1919
}
2020

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

2626
pub fn main() {}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ pub fn main() {
2626
[_, ..tail] => {
2727
match tail {
2828
[Foo { string: a }, Foo { string: b }] => {
29-
//~^ ERROR cannot move out of dereference of & pointer
30-
//~^^ ERROR cannot move out of dereference of & pointer
29+
//~^ ERROR cannot move out of dereference of `&`-pointer
30+
//~^^ ERROR cannot move out of dereference of `&`-pointer
3131
}
3232
_ => {
3333
unreachable!();

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ trait parse {
1818

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

0 commit comments

Comments
 (0)