Skip to content

Commit

Permalink
backticks for syntax elements
Browse files Browse the repository at this point in the history
  • Loading branch information
kud1ing committed Feb 17, 2014
1 parent a7aa4c4 commit e22d18d
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
4 changes: 2 additions & 2 deletions src/librustc/middle/typeck/check/_match.rs
Expand Up @@ -687,8 +687,8 @@ pub fn check_pointer_pat(pcx: &pat_ctxt,
e, actual)})},
Some(expected),
format!("{} pattern", match pointer_kind {
Send => "a ~-box",
Borrowed => "an &-pointer"
Send => "a `~`-box",
Borrowed => "an `&`-pointer"
}),
None);
fcx.write_error(pat_id);
Expand Down
2 changes: 1 addition & 1 deletion src/test/compile-fail/issue-4972.rs
Expand Up @@ -16,7 +16,7 @@ pub enum TraitWrapper {

fn get_tw_map<'lt>(tw: &'lt TraitWrapper) -> &'lt MyTrait {
match *tw {
A(~ref map) => map, //~ ERROR found a ~-box pattern
A(~ref map) => map, //~ ERROR found a `~`-box pattern
}
}

Expand Down
4 changes: 2 additions & 2 deletions src/test/compile-fail/issue-5100.rs
Expand Up @@ -24,12 +24,12 @@ fn main() {

match (true, false) {
~(true, false) => ()
//~^ ERROR mismatched types: expected `(bool,bool)` but found a ~-box pattern
//~^ ERROR mismatched types: expected `(bool,bool)` but found a `~`-box pattern
}

match (true, false) {
&(true, false) => ()
//~^ ERROR mismatched types: expected `(bool,bool)` but found an &-pointer pattern
//~^ ERROR mismatched types: expected `(bool,bool)` but found an `&`-pointer pattern
}


Expand Down

5 comments on commit e22d18d

@bors
Copy link
Contributor

@bors bors commented on e22d18d Feb 18, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@bors
Copy link
Contributor

@bors bors commented on e22d18d Feb 18, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

merging kud1ing/rust/backticks = e22d18d into auto

@bors
Copy link
Contributor

@bors bors commented on e22d18d Feb 18, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

kud1ing/rust/backticks = e22d18d merged ok, testing candidate = 8391b71

@bors
Copy link
Contributor

@bors bors commented on e22d18d Feb 18, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@bors
Copy link
Contributor

@bors bors commented on e22d18d Feb 18, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fast-forwarding master to auto = 8391b71

Please sign in to comment.