Skip to content

Commit 8391b71

Browse files
committed
auto merge of #12351 : kud1ing/rust/backticks, r=alexcrichton
2 parents e4ce8a9 + e22d18d commit 8391b71

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

src/librustc/middle/typeck/check/_match.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -687,8 +687,8 @@ pub fn check_pointer_pat(pcx: &pat_ctxt,
687687
e, actual)})},
688688
Some(expected),
689689
format!("{} pattern", match pointer_kind {
690-
Send => "a ~-box",
691-
Borrowed => "an &-pointer"
690+
Send => "a `~`-box",
691+
Borrowed => "an `&`-pointer"
692692
}),
693693
None);
694694
fcx.write_error(pat_id);

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ pub enum TraitWrapper {
1616

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

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,12 @@ fn main() {
2424

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

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

3535

0 commit comments

Comments
 (0)