From 7ddafaf6f95370935be339af71974da34752f1b5 Mon Sep 17 00:00:00 2001 From: Samy Kacimi Date: Mon, 15 Jul 2019 23:23:39 +0200 Subject: [PATCH] normalize use of backticks in compiler messages for libsyntax/parse https://github.com/rust-lang/rust/issues/60532 --- src/libsyntax/parse/attr.rs | 2 +- src/libsyntax/parse/diagnostics.rs | 2 +- src/libsyntax/parse/lexer/mod.rs | 2 +- src/test/ui/issues/issue-22644.stderr | 2 +- src/test/ui/issues/issue-34255-1.stderr | 2 +- src/test/ui/lifetime_starts_expressions.stderr | 2 +- src/test/ui/parser/recover-from-bad-variant.stderr | 2 +- .../ui/type/type-ascription-instead-of-statement-end.stderr | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/libsyntax/parse/attr.rs b/src/libsyntax/parse/attr.rs index b28d48b9445..1758d0b0bb9 100644 --- a/src/libsyntax/parse/attr.rs +++ b/src/libsyntax/parse/attr.rs @@ -226,7 +226,7 @@ fn parse_attribute_with_inner_parse_policy(&mut self, fn parse_unsuffixed_lit(&mut self) -> PResult<'a, ast::Lit> { let lit = self.parse_lit()?; - debug!("Checking if {:?} is unusuffixed.", lit); + debug!("checking if {:?} is unusuffixed", lit); if !lit.node.is_unsuffixed() { let msg = "suffixed literals are not allowed in attributes"; diff --git a/src/libsyntax/parse/diagnostics.rs b/src/libsyntax/parse/diagnostics.rs index 676c87f9daa..0e88a0ee289 100644 --- a/src/libsyntax/parse/diagnostics.rs +++ b/src/libsyntax/parse/diagnostics.rs @@ -919,7 +919,7 @@ pub fn unexpected_try_recover( Applicability::MaybeIncorrect, ); } else { - err.note("#![feature(type_ascription)] lets you annotate an \ + err.note("`#![feature(type_ascription)]` lets you annotate an \ expression with a type: `: `") .span_note( lhs_span, diff --git a/src/libsyntax/parse/lexer/mod.rs b/src/libsyntax/parse/lexer/mod.rs index d0c4e8d6a56..7be8e57c7f8 100644 --- a/src/libsyntax/parse/lexer/mod.rs +++ b/src/libsyntax/parse/lexer/mod.rs @@ -443,7 +443,7 @@ fn scan_comment(&mut self) -> Option { let is_beginning_of_file = self.pos == self.source_file.start_pos; if is_beginning_of_file { - debug!("Skipping a shebang"); + debug!("skipping a shebang"); let start = self.pos; while !self.ch_is('\n') && !self.is_eof() { self.bump(); diff --git a/src/test/ui/issues/issue-22644.stderr b/src/test/ui/issues/issue-22644.stderr index cf369535465..4f0dc0a4887 100644 --- a/src/test/ui/issues/issue-22644.stderr +++ b/src/test/ui/issues/issue-22644.stderr @@ -89,7 +89,7 @@ error: expected type, found `4` LL | println!("{}", a: &mut 4); | ^ expecting a type here because of type ascription | - = note: #![feature(type_ascription)] lets you annotate an expression with a type: `: ` + = note: `#![feature(type_ascription)]` lets you annotate an expression with a type: `: ` note: this expression expects an ascribed type after the colon --> $DIR/issue-22644.rs:34:20 | diff --git a/src/test/ui/issues/issue-34255-1.stderr b/src/test/ui/issues/issue-34255-1.stderr index 01f39537770..0218a7abeaa 100644 --- a/src/test/ui/issues/issue-34255-1.stderr +++ b/src/test/ui/issues/issue-34255-1.stderr @@ -4,7 +4,7 @@ error: expected type, found `42` LL | Test::Drill(field: 42); | ^^ expecting a type here because of type ascription | - = note: #![feature(type_ascription)] lets you annotate an expression with a type: `: ` + = note: `#![feature(type_ascription)]` lets you annotate an expression with a type: `: ` note: this expression expects an ascribed type after the colon --> $DIR/issue-34255-1.rs:8:17 | diff --git a/src/test/ui/lifetime_starts_expressions.stderr b/src/test/ui/lifetime_starts_expressions.stderr index 8ae8018c2ff..84e4c87ebc4 100644 --- a/src/test/ui/lifetime_starts_expressions.stderr +++ b/src/test/ui/lifetime_starts_expressions.stderr @@ -14,7 +14,7 @@ error: expected type, found keyword `loop` LL | loop { break 'label: loop { break 'label 42; }; } | ^^^^ expecting a type here because of type ascription | - = note: #![feature(type_ascription)] lets you annotate an expression with a type: `: ` + = note: `#![feature(type_ascription)]` lets you annotate an expression with a type: `: ` note: this expression expects an ascribed type after the colon --> $DIR/lifetime_starts_expressions.rs:6:12 | diff --git a/src/test/ui/parser/recover-from-bad-variant.stderr b/src/test/ui/parser/recover-from-bad-variant.stderr index 150d74f0742..d525bd3f4c6 100644 --- a/src/test/ui/parser/recover-from-bad-variant.stderr +++ b/src/test/ui/parser/recover-from-bad-variant.stderr @@ -4,7 +4,7 @@ error: expected type, found `3` LL | let x = Enum::Foo(a: 3, b: 4); | ^ expecting a type here because of type ascription | - = note: #![feature(type_ascription)] lets you annotate an expression with a type: `: ` + = note: `#![feature(type_ascription)]` lets you annotate an expression with a type: `: ` note: this expression expects an ascribed type after the colon --> $DIR/recover-from-bad-variant.rs:7:23 | diff --git a/src/test/ui/type/type-ascription-instead-of-statement-end.stderr b/src/test/ui/type/type-ascription-instead-of-statement-end.stderr index 4929922c83f..1f8989db814 100644 --- a/src/test/ui/type/type-ascription-instead-of-statement-end.stderr +++ b/src/test/ui/type/type-ascription-instead-of-statement-end.stderr @@ -12,7 +12,7 @@ error: expected type, found `0` LL | println!("test"): 0; | ^ expecting a type here because of type ascription | - = note: #![feature(type_ascription)] lets you annotate an expression with a type: `: ` + = note: `#![feature(type_ascription)]` lets you annotate an expression with a type: `: ` note: this expression expects an ascribed type after the colon --> $DIR/type-ascription-instead-of-statement-end.rs:9:5 |