diff options
| author | bors <bors@rust-lang.org> | 2014-02-20 08:21:45 -0800 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2014-02-20 08:21:45 -0800 |
| commit | 1366e04cf48a3274571a4ae88f9700834ffd58c5 (patch) | |
| tree | 30866cada01f6c451b7a34b786b9fe915c536809 | |
| parent | 06e1281198da31219b89a7cdb32f3c05b76afc07 (diff) | |
| parent | 4ad57513f4eac1158ad5051a586af16be52fb6c8 (diff) | |
| download | rust-1366e04cf48a3274571a4ae88f9700834ffd58c5.tar.gz rust-1366e04cf48a3274571a4ae88f9700834ffd58c5.zip | |
auto merge of #12405 : kud1ing/rust/backticks, r=huonw
| -rw-r--r-- | src/librustc/middle/mem_categorization.rs | 2 | ||||
| -rw-r--r-- | src/test/compile-fail/borrowck-move-in-irrefut-pat.rs | 6 | ||||
| -rw-r--r-- | src/test/compile-fail/borrowck-move-out-of-vec-tail.rs | 4 | ||||
| -rw-r--r-- | src/test/compile-fail/issue-2590.rs | 2 |
4 files changed, 7 insertions, 7 deletions
diff --git a/src/librustc/middle/mem_categorization.rs b/src/librustc/middle/mem_categorization.rs index a893840f678..f423c37b9c7 100644 --- a/src/librustc/middle/mem_categorization.rs +++ b/src/librustc/middle/mem_categorization.rs @@ -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)) } } } diff --git a/src/test/compile-fail/borrowck-move-in-irrefut-pat.rs b/src/test/compile-fail/borrowck-move-in-irrefut-pat.rs index 63f88347090..47bb75cd11b 100644 --- a/src/test/compile-fail/borrowck-move-in-irrefut-pat.rs +++ b/src/test/compile-fail/borrowck-move-in-irrefut-pat.rs @@ -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() {} diff --git a/src/test/compile-fail/borrowck-move-out-of-vec-tail.rs b/src/test/compile-fail/borrowck-move-out-of-vec-tail.rs index 9a99c66b9d6..67b83ee84e4 100644 --- a/src/test/compile-fail/borrowck-move-out-of-vec-tail.rs +++ b/src/test/compile-fail/borrowck-move-out-of-vec-tail.rs @@ -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!(); diff --git a/src/test/compile-fail/issue-2590.rs b/src/test/compile-fail/issue-2590.rs index 92f2e5ea689..a2bb583a3d6 100644 --- a/src/test/compile-fail/issue-2590.rs +++ b/src/test/compile-fail/issue-2590.rs @@ -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 } } |