soften the wording for removing type ascription

chenyukang · chenyukang · commit 5d1796a608d3 · 2023-05-01T16:37:00.000+08:00
diff --git a/compiler/rustc_builtin_macros/src/asm.rs b/compiler/rustc_builtin_macros/src/asm.rs
@@ -68,8 +68,7 @@ pub fn parse_asm_args<'a>(
         if !p.eat(&token::Comma) {
             if allow_templates {
                 // After a template string, we always expect *only* a comma...
-                let mut err = diag.create_err(errors::AsmExpectedComma { span: p.token.span });
-                return Err(err);
+                return Err(diag.create_err(errors::AsmExpectedComma { span: p.token.span }));
             } else {
                 // ...after that delegate to `expect` to also include the other expected tokens.
                 return Err(p.expect(&token::Comma).err().unwrap());
diff --git a/compiler/rustc_parse/messages.ftl b/compiler/rustc_parse/messages.ftl
@@ -426,7 +426,8 @@ parse_path_single_colon = path separator must be a double colon
 parse_colon_as_semi = statements are terminated with a semicolon
     .suggestion = use a semicolon instead
 
-parse_type_ascription_removed = type ascription syntax has been removed, see issue #101728 <https://github.com/rust-lang/rust/issues/101728>
+parse_type_ascription_removed =
+    if you meant to annotate an expression with a type, the type ascription syntax has been removed, see issue #101728 <https://github.com/rust-lang/rust/issues/101728>
 
 parse_where_clause_before_tuple_struct_body = where clauses are not allowed before tuple struct bodies
     .label = unexpected where clause
diff --git a/compiler/rustc_parse/src/parser/diagnostics.rs b/compiler/rustc_parse/src/parser/diagnostics.rs
@@ -1569,14 +1569,9 @@ impl<'a> Parser<'a> {
     }
 
     pub(super) fn expect_semi(&mut self) -> PResult<'a, ()> {
-        if self.eat(&token::Semi) {
+        if self.eat(&token::Semi) || self.recover_colon_as_semi() {
             return Ok(());
         }
-
-        if self.recover_colon_as_semi() {
-            return Ok(());
-        }
-
         self.expect(&token::Semi).map(drop) // Error unconditionally
     }
 
@@ -1597,9 +1592,7 @@ impl<'a> Parser<'a> {
                 span: self.token.span,
                 type_ascription: self.sess.unstable_features.is_nightly_build().then_some(()),
             });
-
             self.bump();
-
             return true;
         }
 
diff --git a/compiler/rustc_parse/src/parser/path.rs b/compiler/rustc_parse/src/parser/path.rs
@@ -9,7 +9,7 @@ use rustc_ast::{
     AssocConstraintKind, BlockCheckMode, GenericArg, GenericArgs, Generics, ParenthesizedArgs,
     Path, PathSegment, QSelf,
 };
-use rustc_errors::{pluralize, Applicability, IntoDiagnostic, PResult};
+use rustc_errors::{Applicability, IntoDiagnostic, PResult};
 use rustc_span::source_map::{BytePos, Span};
 use rustc_span::symbol::{kw, sym, Ident};
 use std::mem;
diff --git a/compiler/rustc_parse/src/parser/stmt.rs b/compiler/rustc_parse/src/parser/stmt.rs
@@ -645,7 +645,7 @@ impl<'a> Parser<'a> {
 
                             if self.recover_colon_as_semi() {
                                 // recover_colon_as_semi has already emitted a nicer error.
-                                e.cancel();
+                                e.delay_as_bug();
                                 add_semi_to_stmt = true;
                                 eat_semi = false;
 
@@ -672,7 +672,7 @@ impl<'a> Parser<'a> {
                                         };
                                         match self.parse_expr_labeled(label, false) {
                                             Ok(labeled_expr) => {
-                                                e.cancel();
+                                                e.delay_as_bug();
                                                 self.sess.emit_err(MalformedLoopLabel {
                                                     span: label.ident.span,
                                                     correct_label: label.ident,
diff --git a/tests/ui/generics/single-colon-path-not-const-generics.stderr b/tests/ui/generics/single-colon-path-not-const-generics.stderr
@@ -6,7 +6,7 @@ LL | pub struct Foo {
 LL |   a: Vec<foo::bar:A>,
    |                  ^ help: use a double colon instead: `::`
    |
-   = note: type ascription syntax has been removed, see issue #101728 <https://github.com/rust-lang/rust/issues/101728>
+   = note: if you meant to annotate an expression with a type, the type ascription syntax has been removed, see issue #101728 <https://github.com/rust-lang/rust/issues/101728>
 
 error: aborting due to previous error
 
diff --git a/tests/ui/suggestions/type-ascription-instead-of-method.stderr b/tests/ui/suggestions/type-ascription-instead-of-method.stderr
@@ -4,7 +4,7 @@ error: path separator must be a double colon
 LL |     let _ = Box:new("foo".to_string());
    |                ^ help: use a double colon instead: `::`
    |
-   = note: type ascription syntax has been removed, see issue #101728 <https://github.com/rust-lang/rust/issues/101728>
+   = note: if you meant to annotate an expression with a type, the type ascription syntax has been removed, see issue #101728 <https://github.com/rust-lang/rust/issues/101728>
 
 error: aborting due to previous error
 
diff --git a/tests/ui/suggestions/type-ascription-instead-of-path.stderr b/tests/ui/suggestions/type-ascription-instead-of-path.stderr
@@ -4,7 +4,7 @@ error: path separator must be a double colon
 LL |     std:io::stdin();
    |        ^ help: use a double colon instead: `::`
    |
-   = note: type ascription syntax has been removed, see issue #101728 <https://github.com/rust-lang/rust/issues/101728>
+   = note: if you meant to annotate an expression with a type, the type ascription syntax has been removed, see issue #101728 <https://github.com/rust-lang/rust/issues/101728>
 
 error: aborting due to previous error
 
diff --git a/tests/ui/suggestions/type-ascription-instead-of-variant.stderr b/tests/ui/suggestions/type-ascription-instead-of-variant.stderr
@@ -4,7 +4,7 @@ error: path separator must be a double colon
 LL |     let _ = Option:Some("");
    |                   ^ help: use a double colon instead: `::`
    |
-   = note: type ascription syntax has been removed, see issue #101728 <https://github.com/rust-lang/rust/issues/101728>
+   = note: if you meant to annotate an expression with a type, the type ascription syntax has been removed, see issue #101728 <https://github.com/rust-lang/rust/issues/101728>
 
 error: aborting due to previous error
 
diff --git a/tests/ui/type/ascription/issue-47666.stderr b/tests/ui/type/ascription/issue-47666.stderr
@@ -4,7 +4,7 @@ error: path separator must be a double colon
 LL |     let _ = Option:Some(vec![0, 1]);
    |                   ^ help: use a double colon instead: `::`
    |
-   = note: type ascription syntax has been removed, see issue #101728 <https://github.com/rust-lang/rust/issues/101728>
+   = note: if you meant to annotate an expression with a type, the type ascription syntax has been removed, see issue #101728 <https://github.com/rust-lang/rust/issues/101728>
 
 error: aborting due to previous error
 
diff --git a/tests/ui/type/ascription/issue-54516.stderr b/tests/ui/type/ascription/issue-54516.stderr
@@ -4,7 +4,7 @@ error: path separator must be a double colon
 LL |     println!("{}", std::mem:size_of::<BTreeMap<u32, u32>>());
    |                            ^ help: use a double colon instead: `::`
    |
-   = note: type ascription syntax has been removed, see issue #101728 <https://github.com/rust-lang/rust/issues/101728>
+   = note: if you meant to annotate an expression with a type, the type ascription syntax has been removed, see issue #101728 <https://github.com/rust-lang/rust/issues/101728>
 
 error: aborting due to previous error
 
diff --git a/tests/ui/type/ascription/issue-60933.stderr b/tests/ui/type/ascription/issue-60933.stderr
@@ -4,7 +4,7 @@ error: path separator must be a double colon
 LL |     let _: usize = std::mem:size_of::<u32>();
    |                            ^ help: use a double colon instead: `::`
    |
-   = note: type ascription syntax has been removed, see issue #101728 <https://github.com/rust-lang/rust/issues/101728>
+   = note: if you meant to annotate an expression with a type, the type ascription syntax has been removed, see issue #101728 <https://github.com/rust-lang/rust/issues/101728>
 
 error: aborting due to previous error
 
diff --git a/tests/ui/type/type-ascription-instead-of-statement-end.stderr b/tests/ui/type/type-ascription-instead-of-statement-end.stderr
@@ -4,7 +4,7 @@ error: statements are terminated with a semicolon
 LL |     println!("test"):
    |                     ^ help: use a semicolon instead: `;`
    |
-   = note: type ascription syntax has been removed, see issue #101728 <https://github.com/rust-lang/rust/issues/101728>
+   = note: if you meant to annotate an expression with a type, the type ascription syntax has been removed, see issue #101728 <https://github.com/rust-lang/rust/issues/101728>
 
 error: expected one of `.`, `;`, `?`, `}`, or an operator, found `:`
   --> $DIR/type-ascription-instead-of-statement-end.rs:7:21
diff --git a/tests/ui/type/type-ascription-with-fn-call.stderr b/tests/ui/type/type-ascription-with-fn-call.stderr
@@ -4,7 +4,7 @@ error: statements are terminated with a semicolon
 LL |     f()  :
    |          ^ help: use a semicolon instead: `;`
    |
-   = note: type ascription syntax has been removed, see issue #101728 <https://github.com/rust-lang/rust/issues/101728>
+   = note: if you meant to annotate an expression with a type, the type ascription syntax has been removed, see issue #101728 <https://github.com/rust-lang/rust/issues/101728>
 
 error: aborting due to previous error
 

Original file line number	Diff line number	Diff line change
`@@ -1569,14 +1569,9 @@ impl<'a> Parser<'a> {`
`1569`	`1569`	`}`
`1570`	`1570`
`1571`	`1571`	`pub(super) fn expect_semi(&mut self) -> PResult<'a, ()> {`
`1572`		`- if self.eat(&token::Semi) {`
	`1572`	`+ if self.eat(&token::Semi) \|\| self.recover_colon_as_semi() {`
`1573`	`1573`	`return Ok(());`
`1574`	`1574`	`}`
`1575`		`-`
`1576`		`- if self.recover_colon_as_semi() {`
`1577`		`- return Ok(());`
`1578`		`- }`
`1579`		`-`
`1580`	`1575`	`self.expect(&token::Semi).map(drop) // Error unconditionally`
`1581`	`1576`	`}`
`1582`	`1577`
`@@ -1597,9 +1592,7 @@ impl<'a> Parser<'a> {`
`1597`	`1592`	`span: self.token.span,`
`1598`	`1593`	`type_ascription: self.sess.unstable_features.is_nightly_build().then_some(()),`
`1599`	`1594`	`});`
`1600`		`-`
`1601`	`1595`	`self.bump();`
`1602`		`-`
`1603`	`1596`	`return true;`
`1604`	`1597`	`}`
`1605`	`1598`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ LL \| pub struct Foo {`
`6`	`6`	`LL \| a: Vec<foo::bar:A>,`
`7`	`7`	\| ^ help: use a double colon instead: `::`
`8`	`8`	`\|`
`9`		`- = note: type ascription syntax has been removed, see issue #101728 <https://github.com/rust-lang/rust/issues/101728>`
	`9`	`+ = note: if you meant to annotate an expression with a type, the type ascription syntax has been removed, see issue #101728 <https://github.com/rust-lang/rust/issues/101728>`
`10`	`10`
`11`	`11`	`error: aborting due to previous error`
`12`	`12`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@ error: path separator must be a double colon`
`4`	`4`	`LL \| let _ = Box:new("foo".to_string());`
`5`	`5`	\| ^ help: use a double colon instead: `::`
`6`	`6`	`\|`
`7`		`- = note: type ascription syntax has been removed, see issue #101728 <https://github.com/rust-lang/rust/issues/101728>`
	`7`	`+ = note: if you meant to annotate an expression with a type, the type ascription syntax has been removed, see issue #101728 <https://github.com/rust-lang/rust/issues/101728>`
`8`	`8`
`9`	`9`	`error: aborting due to previous error`
`10`	`10`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@ error: path separator must be a double colon`
`4`	`4`	`LL \| std:io::stdin();`
`5`	`5`	\| ^ help: use a double colon instead: `::`
`6`	`6`	`\|`
`7`		`- = note: type ascription syntax has been removed, see issue #101728 <https://github.com/rust-lang/rust/issues/101728>`
	`7`	`+ = note: if you meant to annotate an expression with a type, the type ascription syntax has been removed, see issue #101728 <https://github.com/rust-lang/rust/issues/101728>`
`8`	`8`
`9`	`9`	`error: aborting due to previous error`
`10`	`10`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@ error: path separator must be a double colon`
`4`	`4`	`LL \| let _ = Option:Some("");`
`5`	`5`	\| ^ help: use a double colon instead: `::`
`6`	`6`	`\|`
`7`		`- = note: type ascription syntax has been removed, see issue #101728 <https://github.com/rust-lang/rust/issues/101728>`
	`7`	`+ = note: if you meant to annotate an expression with a type, the type ascription syntax has been removed, see issue #101728 <https://github.com/rust-lang/rust/issues/101728>`
`8`	`8`
`9`	`9`	`error: aborting due to previous error`
`10`	`10`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@ error: path separator must be a double colon`
`4`	`4`	`LL \| let _ = Option:Some(vec![0, 1]);`
`5`	`5`	\| ^ help: use a double colon instead: `::`
`6`	`6`	`\|`
`7`		`- = note: type ascription syntax has been removed, see issue #101728 <https://github.com/rust-lang/rust/issues/101728>`
	`7`	`+ = note: if you meant to annotate an expression with a type, the type ascription syntax has been removed, see issue #101728 <https://github.com/rust-lang/rust/issues/101728>`
`8`	`8`
`9`	`9`	`error: aborting due to previous error`
`10`	`10`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@ error: path separator must be a double colon`
`4`	`4`	`LL \| println!("{}", std::mem:size_of::<BTreeMap<u32, u32>>());`
`5`	`5`	\| ^ help: use a double colon instead: `::`
`6`	`6`	`\|`
`7`		`- = note: type ascription syntax has been removed, see issue #101728 <https://github.com/rust-lang/rust/issues/101728>`
	`7`	`+ = note: if you meant to annotate an expression with a type, the type ascription syntax has been removed, see issue #101728 <https://github.com/rust-lang/rust/issues/101728>`
`8`	`8`
`9`	`9`	`error: aborting due to previous error`
`10`	`10`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@ error: path separator must be a double colon`
`4`	`4`	`LL \| let _: usize = std::mem:size_of::<u32>();`
`5`	`5`	\| ^ help: use a double colon instead: `::`
`6`	`6`	`\|`
`7`		`- = note: type ascription syntax has been removed, see issue #101728 <https://github.com/rust-lang/rust/issues/101728>`
	`7`	`+ = note: if you meant to annotate an expression with a type, the type ascription syntax has been removed, see issue #101728 <https://github.com/rust-lang/rust/issues/101728>`
`8`	`8`
`9`	`9`	`error: aborting due to previous error`
`10`	`10`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@ error: statements are terminated with a semicolon`
`4`	`4`	`LL \| println!("test"):`
`5`	`5`	\| ^ help: use a semicolon instead: `;`
`6`	`6`	`\|`
`7`		`- = note: type ascription syntax has been removed, see issue #101728 <https://github.com/rust-lang/rust/issues/101728>`
	`7`	`+ = note: if you meant to annotate an expression with a type, the type ascription syntax has been removed, see issue #101728 <https://github.com/rust-lang/rust/issues/101728>`
`8`	`8`
`9`	`9`	error: expected one of `.`, `;`, `?`, `}`, or an operator, found `:`
`10`	`10`	`--> $DIR/type-ascription-instead-of-statement-end.rs:7:21`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@ error: statements are terminated with a semicolon`
`4`	`4`	`LL \| f() :`
`5`	`5`	\| ^ help: use a semicolon instead: `;`
`6`	`6`	`\|`
`7`		`- = note: type ascription syntax has been removed, see issue #101728 <https://github.com/rust-lang/rust/issues/101728>`
	`7`	`+ = note: if you meant to annotate an expression with a type, the type ascription syntax has been removed, see issue #101728 <https://github.com/rust-lang/rust/issues/101728>`
`8`	`8`
`9`	`9`	`error: aborting due to previous error`
`10`	`10`