diff options
| author | Ralf Jung <post@ralfj.de> | 2020-05-16 19:46:37 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-16 19:46:37 +0200 |
| commit | 12112f4d7d3a9dd1b5f285a38b661e9d50c2c0fa (patch) | |
| tree | 70d83a4352454c951413f2a3cc0a056d07a1bccf | |
| parent | 4fe6d52d976e0468a70a2617f207c9ad893cdd3d (diff) | |
| parent | 004f4f389e5cf5cbb1f9604c5f7691cd16b1966e (diff) | |
Rollup merge of #72254 - ehuss:double-backtick, r=dtolnay
Remove redundant backtick in error message. The value passed in already has backticks surrounding the text.
| -rw-r--r-- | src/librustc_parse/parser/diagnostics.rs | 2 | ||||
| -rw-r--r-- | src/test/ui/parser/issue-3036.stderr | 2 | ||||
| -rw-r--r-- | src/test/ui/parser/recover-missing-semi.stderr | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/src/librustc_parse/parser/diagnostics.rs b/src/librustc_parse/parser/diagnostics.rs index 437d0ffa119..93c7faf22a7 100644 --- a/src/librustc_parse/parser/diagnostics.rs +++ b/src/librustc_parse/parser/diagnostics.rs @@ -927,7 +927,7 @@ impl<'a> Parser<'a> { return Ok(()); } let sm = self.sess.source_map(); - let msg = format!("expected `;`, found `{}`", super::token_descr(&self.token)); + let msg = format!("expected `;`, found {}", super::token_descr(&self.token)); let appl = Applicability::MachineApplicable; if self.token.span == DUMMY_SP || self.prev_token.span == DUMMY_SP { // Likely inside a macro, can't provide meaningful suggestions. diff --git a/src/test/ui/parser/issue-3036.stderr b/src/test/ui/parser/issue-3036.stderr index b6557163d45..e5f5a7d8968 100644 --- a/src/test/ui/parser/issue-3036.stderr +++ b/src/test/ui/parser/issue-3036.stderr @@ -1,4 +1,4 @@ -error: expected `;`, found ``}`` +error: expected `;`, found `}` --> $DIR/issue-3036.rs:5:14 | LL | let x = 3 diff --git a/src/test/ui/parser/recover-missing-semi.stderr b/src/test/ui/parser/recover-missing-semi.stderr index 2f2464d3629..ba479828538 100644 --- a/src/test/ui/parser/recover-missing-semi.stderr +++ b/src/test/ui/parser/recover-missing-semi.stderr @@ -1,4 +1,4 @@ -error: expected `;`, found `keyword `let`` +error: expected `;`, found keyword `let` --> $DIR/recover-missing-semi.rs:2:22 | LL | let _: usize = () @@ -7,7 +7,7 @@ LL | let _: usize = () LL | let _ = 3; | --- unexpected token -error: expected `;`, found `keyword `return`` +error: expected `;`, found keyword `return` --> $DIR/recover-missing-semi.rs:9:22 | LL | let _: usize = () |