diff options
| author | bors <bors@rust-lang.org> | 2014-02-18 05:31:55 -0800 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2014-02-18 05:31:55 -0800 |
| commit | 8391b71122cd88bcfb729f868b662ffdad61b583 (patch) | |
| tree | 651d845dd227f96673cfc4ff5754654fdc5f5a2d | |
| parent | e4ce8a9689174ba09d3c32410681591263b97645 (diff) | |
| parent | e22d18dcd0bfb520ca0581cf6102cbb924ae3a74 (diff) | |
| download | rust-8391b71122cd88bcfb729f868b662ffdad61b583.tar.gz rust-8391b71122cd88bcfb729f868b662ffdad61b583.zip | |
auto merge of #12351 : kud1ing/rust/backticks, r=alexcrichton
| -rw-r--r-- | src/librustc/middle/typeck/check/_match.rs | 4 | ||||
| -rw-r--r-- | src/test/compile-fail/issue-4972.rs | 2 | ||||
| -rw-r--r-- | src/test/compile-fail/issue-5100.rs | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/src/librustc/middle/typeck/check/_match.rs b/src/librustc/middle/typeck/check/_match.rs index 8117e816493..d33afd8fd03 100644 --- a/src/librustc/middle/typeck/check/_match.rs +++ b/src/librustc/middle/typeck/check/_match.rs @@ -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); diff --git a/src/test/compile-fail/issue-4972.rs b/src/test/compile-fail/issue-4972.rs index fcd15a21219..8d281a0b174 100644 --- a/src/test/compile-fail/issue-4972.rs +++ b/src/test/compile-fail/issue-4972.rs @@ -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 } } diff --git a/src/test/compile-fail/issue-5100.rs b/src/test/compile-fail/issue-5100.rs index ae523e1a9c4..b7c440d30b3 100644 --- a/src/test/compile-fail/issue-5100.rs +++ b/src/test/compile-fail/issue-5100.rs @@ -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 } |