auto merge of #12351 : kud1ing/rust/backticks, r=alexcrichton

This commit is contained in:
bors 2014-02-18 05:31:55 -08:00
commit 8391b71122
3 changed files with 5 additions and 5 deletions

View File

@ -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);

View File

@ -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
}
}

View File

@ -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
}