Skip to content

Commit 689e29f

Browse files
CentrilCentril
authored
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
2 parents b32dc91 + 7fd014d commit 689e29f

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+135
-135
lines changed

‎src/librustc_parse/lexer/tokentrees.rs

+5-5
Original file line numberDiff line numberDiff line change
@@ -78,11 +78,11 @@ impl<'a> TokenTreesReader<'a> {
7878
let sm = self.string_reader.sess.source_map();
7979
match self.token.kind {
8080
token::Eof => {
81-
let msg = "this file contains an un-closed delimiter";
81+
let msg = "this file contains an unclosed delimiter";
8282
let mut err =
8383
self.string_reader.sess.span_diagnostic.struct_span_err(self.token.span, msg);
8484
for &(_, sp) in &self.open_braces {
85-
err.span_label(sp, "un-closed delimiter");
85+
err.span_label(sp, "unclosed delimiter");
8686
self.unmatched_braces.push(UnmatchedBrace {
8787
expected_delim: token::DelimToken::Brace,
8888
found_delim: None,
@@ -155,7 +155,7 @@ impl<'a> TokenTreesReader<'a> {
155155
close_brace_span,
156156
));
157157
}
158-
// Parse the close delimiter.
158+
// Parse the closing delimiter.
159159
self.real_token();
160160
}
161161
// Incorrect delimiter.
@@ -218,7 +218,7 @@ impl<'a> TokenTreesReader<'a> {
218218
// An unexpected closing delimiter (i.e., there is no
219219
// matching opening delimiter).
220220
let token_str = token_to_string(&self.token);
221-
let msg = format!("unexpected close delimiter: `{}`", token_str);
221+
let msg = format!("unexpected closing delimiter: `{}`", token_str);
222222
let mut err =
223223
self.string_reader.sess.span_diagnostic.struct_span_err(self.token.span, &msg);
224224

@@ -228,7 +228,7 @@ impl<'a> TokenTreesReader<'a> {
228228
"this block is empty, you might have not meant to close it",
229229
);
230230
}
231-
err.span_label(self.token.span, "unexpected close delimiter");
231+
err.span_label(self.token.span, "unexpected closing delimiter");
232232
Err(err)
233233
}
234234
_ => {

‎src/librustc_parse/parser/mod.rs

+4-4
Original file line numberDiff line numberDiff line change
@@ -1354,16 +1354,16 @@ crate fn make_unclosed_delims_error(
13541354
let mut err = sess.span_diagnostic.struct_span_err(
13551355
unmatched.found_span,
13561356
&format!(
1357-
"incorrect close delimiter: `{}`",
1357+
"mismatched closing delimiter: `{}`",
13581358
pprust::token_kind_to_string(&token::CloseDelim(found_delim)),
13591359
),
13601360
);
1361-
err.span_label(unmatched.found_span, "incorrect close delimiter");
1361+
err.span_label(unmatched.found_span, "mismatched closing delimiter");
13621362
if let Some(sp) = unmatched.candidate_span {
1363-
err.span_label(sp, "close delimiter possibly meant for this");
1363+
err.span_label(sp, "closing delimiter possibly meant for this");
13641364
}
13651365
if let Some(sp) = unmatched.unclosed_span {
1366-
err.span_label(sp, "un-closed delimiter");
1366+
err.span_label(sp, "unclosed delimiter");
13671367
}
13681368
Some(err)
13691369
}

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@ fn main() {}
22

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

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

+7-7
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
1-
error: this file contains an un-closed delimiter
2-
--> $DIR/issue-62554.rs:5:53
1+
error: this file contains an unclosed delimiter
2+
--> $DIR/issue-62554.rs:5:52
33
|
44
LL | fn foo(u: u8) { if u8 macro_rules! u8 { (u6) => { fn uuuuuuuuuuu() { use s loo mod u8 {
5-
| - - - - - un-closed delimiter
5+
| - - - - - unclosed delimiter
66
| | | | |
7-
| | | | un-closed delimiter
8-
| | | un-closed delimiter
9-
| un-closed delimiter un-closed delimiter
7+
| | | | unclosed delimiter
8+
| | | unclosed delimiter
9+
| unclosed delimiter unclosed delimiter
1010
LL |
1111
LL |
12-
| ^
12+
| ^
1313

1414
error: expected `{`, found `macro_rules`
1515
--> $DIR/issue-62554.rs:3:23

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

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

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

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
1-
error: this file contains an un-closed delimiter
2-
--> $DIR/parser-recovery-1.rs:15:55
1+
error: this file contains an unclosed delimiter
2+
--> $DIR/parser-recovery-1.rs:15:54
33
|
44
LL | trait Foo {
5-
| - un-closed delimiter
5+
| - unclosed delimiter
66
LL | fn bar() {
77
| - this delimiter might not be properly closed...
88
...
99
LL | }
1010
| - ...as it matches this but it has different indentation
1111
...
1212
LL | }
13-
| ^
13+
| ^
1414

1515
error: unexpected token: `;`
1616
--> $DIR/parser-recovery-1.rs:12:15

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
trait Foo {
66
fn bar() {
77
let x = foo(); //~ ERROR cannot find function `foo` in this scope
8-
) //~ ERROR incorrect close delimiter: `)`
8+
) //~ ERROR mismatched closing delimiter: `)`
99
}
1010

1111
fn main() {

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,14 @@ error: unexpected token: `;`
44
LL | let x = y.;
55
| ^
66

7-
error: incorrect close delimiter: `)`
7+
error: mismatched closing delimiter: `)`
88
--> $DIR/parser-recovery-2.rs:8:5
99
|
1010
LL | fn bar() {
11-
| - un-closed delimiter
11+
| - unclosed delimiter
1212
LL | let x = foo();
1313
LL | )
14-
| ^ incorrect close delimiter
14+
| ^ mismatched closing delimiter
1515

1616
error[E0425]: cannot find function `foo` in this scope
1717
--> $DIR/parser-recovery-2.rs:7:17

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
struct Obj {
2-
//~^ NOTE: un-closed delimiter
2+
//~^ NOTE: unclosed delimiter
33
member: usize
44
)
5-
//~^ ERROR incorrect close delimiter
6-
//~| NOTE incorrect close delimiter
5+
//~^ ERROR mismatched closing delimiter
6+
//~| NOTE mismatched closing delimiter
77

88
fn main() {}

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
error: incorrect close delimiter: `)`
1+
error: mismatched closing delimiter: `)`
22
--> $DIR/issue-10636-1.rs:4:1
33
|
44
LL | struct Obj {
5-
| - un-closed delimiter
5+
| - unclosed delimiter
66
...
77
LL | )
8-
| ^ incorrect close delimiter
8+
| ^ mismatched closing delimiter
99

1010
error: aborting due to previous error
1111

‎src/test/ui/parser/issue-2354-1.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
static foo: isize = 2; } //~ ERROR unexpected close delimiter:
1+
static foo: isize = 2; } //~ ERROR unexpected closing delimiter:

‎src/test/ui/parser/issue-2354-1.stderr

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
error: unexpected close delimiter: `}`
1+
error: unexpected closing delimiter: `}`
22
--> $DIR/issue-2354-1.rs:1:24
33
|
44
LL | static foo: isize = 2; }
5-
| ^ unexpected close delimiter
5+
| ^ unexpected closing delimiter
66

77
error: aborting due to previous error
88

‎src/test/ui/parser/issue-2354.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
fn foo() { //~ NOTE un-closed delimiter
1+
fn foo() { //~ NOTE unclosed delimiter
22
match Some(10) {
33
//~^ NOTE this delimiter might not be properly closed...
44
Some(y) => { panic!(); }
@@ -12,4 +12,4 @@ fn bar() {
1212
}
1313

1414
fn main() {}
15-
//~ ERROR this file contains an un-closed delimiter
15+
//~ ERROR this file contains an unclosed delimiter

‎src/test/ui/parser/issue-2354.stderr

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
1-
error: this file contains an un-closed delimiter
2-
--> $DIR/issue-2354.rs:15:53
1+
error: this file contains an unclosed delimiter
2+
--> $DIR/issue-2354.rs:15:52
33
|
44
LL | fn foo() {
5-
| - un-closed delimiter
5+
| - unclosed delimiter
66
LL | match Some(10) {
77
| - this delimiter might not be properly closed...
88
...
99
LL | }
1010
| - ...as it matches this but it has different indentation
1111
...
1212
LL |
13-
| ^
13+
| ^
1414

1515
error: aborting due to previous error
1616

‎src/test/ui/parser/issue-58094-missing-right-square-bracket.stderr

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
error: this file contains an un-closed delimiter
1+
error: this file contains an unclosed delimiter
22
--> $DIR/issue-58094-missing-right-square-bracket.rs:4:4
33
|
44
LL | #[Ѕ
55
| - ^
66
| |
7-
| un-closed delimiter
7+
| unclosed delimiter
88

99
error: expected item after attributes
1010
--> $DIR/issue-58094-missing-right-square-bracket.rs:4:4

‎src/test/ui/parser/issue-62524.stderr

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
error: this file contains an un-closed delimiter
1+
error: this file contains an unclosed delimiter
22
--> $DIR/issue-62524.rs:4:3
33
|
44
LL | y![
5-
| - un-closed delimiter
5+
| - unclosed delimiter
66
LL | Ϥ,
77
| ^
88

‎src/test/ui/parser/issue-62546.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
pub t(#
22
//~^ ERROR missing `fn` or `struct` for function or struct definition
3-
//~ ERROR this file contains an un-closed delimiter
3+
//~ ERROR this file contains an unclosed delimiter

‎src/test/ui/parser/issue-62546.stderr

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
error: this file contains an un-closed delimiter
2-
--> $DIR/issue-62546.rs:3:53
1+
error: this file contains an unclosed delimiter
2+
--> $DIR/issue-62546.rs:3:52
33
|
44
LL | pub t(#
5-
| - un-closed delimiter
5+
| - unclosed delimiter
66
LL |
77
LL |
8-
| ^
8+
| ^
99

1010
error: missing `fn` or `struct` for function or struct definition
1111
--> $DIR/issue-62546.rs:1:4

‎src/test/ui/parser/issue-62881.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ fn main() {}
33
fn f() -> isize { fn f() -> isize {} pub f<
44
//~^ ERROR missing `fn` or `struct` for function or struct definition
55
//~| ERROR mismatched types
6-
//~ ERROR this file contains an un-closed delimiter
6+
//~ ERROR this file contains an unclosed delimiter

‎src/test/ui/parser/issue-62881.stderr

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
error: this file contains an un-closed delimiter
2-
--> $DIR/issue-62881.rs:6:53
1+
error: this file contains an unclosed delimiter
2+
--> $DIR/issue-62881.rs:6:52
33
|
44
LL | fn f() -> isize { fn f() -> isize {} pub f<
5-
| - un-closed delimiter
5+
| - unclosed delimiter
66
...
77
LL |
8-
| ^
8+
| ^
99

1010
error: missing `fn` or `struct` for function or struct definition
1111
--> $DIR/issue-62881.rs:3:41

‎src/test/ui/parser/issue-62973.stderr

+9-9
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
error: this file contains an un-closed delimiter
1+
error: this file contains an unclosed delimiter
22
--> $DIR/issue-62973.rs:8:2
33
|
44
LL | fn p() { match s { v, E { [) {) }
5-
| - - un-closed delimiter
5+
| - - unclosed delimiter
66
| |
7-
| un-closed delimiter
7+
| unclosed delimiter
88
LL |
99
LL |
1010
| ^
@@ -44,21 +44,21 @@ LL |
4444
LL |
4545
| ^ expected one of `.`, `?`, `{`, or an operator
4646

47-
error: incorrect close delimiter: `)`
47+
error: mismatched closing delimiter: `)`
4848
--> $DIR/issue-62973.rs:6:28
4949
|
5050
LL | fn p() { match s { v, E { [) {) }
51-
| -^ incorrect close delimiter
51+
| -^ mismatched closing delimiter
5252
| |
53-
| un-closed delimiter
53+
| unclosed delimiter
5454

55-
error: incorrect close delimiter: `)`
55+
error: mismatched closing delimiter: `)`
5656
--> $DIR/issue-62973.rs:6:31
5757
|
5858
LL | fn p() { match s { v, E { [) {) }
59-
| -^ incorrect close delimiter
59+
| -^ mismatched closing delimiter
6060
| |
61-
| un-closed delimiter
61+
| unclosed delimiter
6262

6363
error: aborting due to 6 previous errors
6464

‎src/test/ui/parser/issue-63116.stderr

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
error: this file contains an un-closed delimiter
1+
error: this file contains an unclosed delimiter
22
--> $DIR/issue-63116.rs:3:18
33
|
44
LL | impl W <s(f;Y(;]
55
| - ^
66
| |
7-
| un-closed delimiter
7+
| unclosed delimiter
88

99
error: expected one of `!`, `(`, `)`, `+`, `,`, `::`, or `<`, found `;`
1010
--> $DIR/issue-63116.rs:3:12

‎src/test/ui/parser/issue-63135.stderr

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
error: this file contains an un-closed delimiter
1+
error: this file contains an unclosed delimiter
22
--> $DIR/issue-63135.rs:3:16
33
|
44
LL | fn i(n{...,f #
55
| - - ^
66
| | |
7-
| | un-closed delimiter
8-
| un-closed delimiter
7+
| | unclosed delimiter
8+
| unclosed delimiter
99

1010
error: expected field pattern, found `...`
1111
--> $DIR/issue-63135.rs:3:8

‎src/test/ui/parser/macro-mismatched-delim-brace-paren.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,5 @@ macro_rules! foo { ($($tt:tt)*) => () }
33
fn main() {
44
foo! {
55
bar, "baz", 1, 2.0
6-
) //~ ERROR incorrect close delimiter
6+
) //~ ERROR mismatched closing delimiter
77
}

‎src/test/ui/parser/macro-mismatched-delim-brace-paren.stderr

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
error: incorrect close delimiter: `)`
1+
error: mismatched closing delimiter: `)`
22
--> $DIR/macro-mismatched-delim-brace-paren.rs:6:5
33
|
44
LL | foo! {
5-
| - un-closed delimiter
5+
| - unclosed delimiter
66
LL | bar, "baz", 1, 2.0
77
LL | )
8-
| ^ incorrect close delimiter
8+
| ^ mismatched closing delimiter
99

1010
error: aborting due to previous error
1111

‎src/test/ui/parser/macro-mismatched-delim-paren-brace.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
fn main() {
22
foo! (
33
bar, "baz", 1, 2.0
4-
} //~ ERROR incorrect close delimiter
5-
} //~ ERROR unexpected close delimiter: `}`
4+
} //~ ERROR mismatched closing delimiter
5+
} //~ ERROR unexpected closing delimiter: `}`

0 commit comments

Comments
 (0)