Skip to content

Adjust message style: "& pointer" => "&-pointer" #12405

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 20, 2014
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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 @@ -25,8 +25,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