Rollup merge of #67835 - euclio:delimiter-wording, r=Centril

tweak wording of mismatched delimiter errors

This PR improves the wording of the "incorrect delimiter" error messages. Here's a quick rationale:

- *"un-closed" -> "unclosed"*: "unclosed" is valid English, so there's no need to hyphenate the prefix. This should be pretty uncontroversial, I think.
- *"close delimiter" -> "closing delimiter"*: In my anecdotal experience, I've always heard "closing delimiter" or "closing parenthesis". In addition, the codebase already uses this terminology in comments and function names more than "close delimiter", which could indicate that it's more intuitive.
- "incorrect delimiter" -> "mismatched delimiter": "Incorrect delimiter" is vague; why is it incorrect? "mismatched" clearly indicates why the delimiter is causing the error.

r? @estebank

Author: Centril

src/librustc_parse/lexer/tokentrees.rs

@@ -78,11 +78,11 @@ impl<'a> TokenTreesReader<'a> {
         let sm = self.string_reader.sess.source_map();
         match self.token.kind {
             token::Eof => {
-                let msg = "this file contains an un-closed delimiter";
+                let msg = "this file contains an unclosed delimiter";
                 let mut err =
                     self.string_reader.sess.span_diagnostic.struct_span_err(self.token.span, msg);
                 for &(_, sp) in &self.open_braces {
-                    err.span_label(sp, "un-closed delimiter");
+                    err.span_label(sp, "unclosed delimiter");
                     self.unmatched_braces.push(UnmatchedBrace {
                         expected_delim: token::DelimToken::Brace,
                         found_delim: None,
@@ -155,7 +155,7 @@ impl<'a> TokenTreesReader<'a> {
                                 close_brace_span,
                             ));
                         }
-                        // Parse the close delimiter.
+                        // Parse the closing delimiter.
                         self.real_token();
                     }
                     // Incorrect delimiter.
@@ -218,7 +218,7 @@ impl<'a> TokenTreesReader<'a> {
                 // An unexpected closing delimiter (i.e., there is no
                 // matching opening delimiter).
                 let token_str = token_to_string(&self.token);
-                let msg = format!("unexpected close delimiter: `{}`", token_str);
+                let msg = format!("unexpected closing delimiter: `{}`", token_str);
                 let mut err =
                     self.string_reader.sess.span_diagnostic.struct_span_err(self.token.span, &msg);
 
@@ -228,7 +228,7 @@ impl<'a> TokenTreesReader<'a> {
                         "this block is empty, you might have not meant to close it",
                     );
                 }
-                err.span_label(self.token.span, "unexpected close delimiter");
+                err.span_label(self.token.span, "unexpected closing delimiter");
                 Err(err)
             }
             _ => {

src/librustc_parse/parser/mod.rs

@@ -1354,16 +1354,16 @@ crate fn make_unclosed_delims_error(
     let mut err = sess.span_diagnostic.struct_span_err(
         unmatched.found_span,
         &format!(
-            "incorrect close delimiter: `{}`",
+            "mismatched closing delimiter: `{}`",
             pprust::token_kind_to_string(&token::CloseDelim(found_delim)),
         ),
     );
-    err.span_label(unmatched.found_span, "incorrect close delimiter");
+    err.span_label(unmatched.found_span, "mismatched closing delimiter");
     if let Some(sp) = unmatched.candidate_span {
-        err.span_label(sp, "close delimiter possibly meant for this");
+        err.span_label(sp, "closing delimiter possibly meant for this");
     }
     if let Some(sp) = unmatched.unclosed_span {
-        err.span_label(sp, "un-closed delimiter");
+        err.span_label(sp, "unclosed delimiter");
     }
     Some(err)
 }

src/test/ui/issues/issue-62554.rs

@@ -2,4 +2,4 @@ fn main() {}
 
 fn foo(u: u8) { if u8 macro_rules! u8 { (u6) => { fn uuuuuuuuuuu() { use s loo mod u8 {
 //~^ ERROR expected `{`, found `macro_rules`
-//~ ERROR this file contains an un-closed delimiter
+//~ ERROR this file contains an unclosed delimiter

src/test/ui/issues/issue-62554.stderr

@@ -1,15 +1,15 @@
-error: this file contains an un-closed delimiter
-  --> $DIR/issue-62554.rs:5:53
+error: this file contains an unclosed delimiter
+  --> $DIR/issue-62554.rs:5:52
    |
 LL | fn foo(u: u8) { if u8 macro_rules! u8 { (u6) => { fn uuuuuuuuuuu() { use s loo mod u8 {
-   |               -                       -         -                  -                  - un-closed delimiter
+   |               -                       -         -                  -                  - unclosed delimiter
    |               |                       |         |                  |
-   |               |                       |         |                  un-closed delimiter
-   |               |                       |         un-closed delimiter
-   |               un-closed delimiter     un-closed delimiter
+   |               |                       |         |                  unclosed delimiter
+   |               |                       |         unclosed delimiter
+   |               unclosed delimiter      unclosed delimiter
 LL |
 LL |
-   |                                                     ^
+   |                                                    ^
 
 error: expected `{`, found `macro_rules`
   --> $DIR/issue-62554.rs:3:23

src/test/ui/parser-recovery-1.rs

@@ -12,4 +12,4 @@ fn main() {
     let x = y.;
     //~^ ERROR unexpected token
     //~| ERROR cannot find value `y` in this scope
-} //~ ERROR this file contains an un-closed delimiter
+} //~ ERROR this file contains an unclosed delimiter

src/test/ui/parser-recovery-1.stderr

@@ -1,16 +1,16 @@
-error: this file contains an un-closed delimiter
-  --> $DIR/parser-recovery-1.rs:15:55
+error: this file contains an unclosed delimiter
+  --> $DIR/parser-recovery-1.rs:15:54
    |
 LL | trait Foo {
-   |           - un-closed delimiter
+   |           - unclosed delimiter
 LL |     fn bar() {
    |              - this delimiter might not be properly closed...
 ...
 LL | }
    | - ...as it matches this but it has different indentation
 ...
 LL | }
-   |                                                       ^
+   |                                                      ^
 
 error: unexpected token: `;`
   --> $DIR/parser-recovery-1.rs:12:15

src/test/ui/parser-recovery-2.rs

@@ -5,7 +5,7 @@
 trait Foo {
     fn bar() {
         let x = foo(); //~ ERROR cannot find function `foo` in this scope
-    ) //~ ERROR incorrect close delimiter: `)`
+    ) //~ ERROR mismatched closing delimiter: `)`
 }
 
 fn main() {

src/test/ui/parser-recovery-2.stderr

@@ -4,14 +4,14 @@ error: unexpected token: `;`
 LL |     let x = y.;
    |               ^
 
-error: incorrect close delimiter: `)`
+error: mismatched closing delimiter: `)`
   --> $DIR/parser-recovery-2.rs:8:5
    |
 LL |     fn bar() {
-   |              - un-closed delimiter
+   |              - unclosed delimiter
 LL |         let x = foo();
 LL |     )
-   |     ^ incorrect close delimiter
+   |     ^ mismatched closing delimiter
 
 error[E0425]: cannot find function `foo` in this scope
   --> $DIR/parser-recovery-2.rs:7:17

src/test/ui/parser/issue-10636-1.rs

@@ -1,8 +1,8 @@
 struct Obj {
-    //~^ NOTE: un-closed delimiter
+    //~^ NOTE: unclosed delimiter
     member: usize
 )
-//~^ ERROR incorrect close delimiter
-//~| NOTE incorrect close delimiter
+//~^ ERROR mismatched closing delimiter
+//~| NOTE mismatched closing delimiter
 
 fn main() {}

src/test/ui/parser/issue-10636-1.stderr

@@ -1,11 +1,11 @@
-error: incorrect close delimiter: `)`
+error: mismatched closing delimiter: `)`
   --> $DIR/issue-10636-1.rs:4:1
    |
 LL | struct Obj {
-   |            - un-closed delimiter
+   |            - unclosed delimiter
 ...
 LL | )
-   | ^ incorrect close delimiter
+   | ^ mismatched closing delimiter
 
 error: aborting due to previous error