diff options
| author | Andy Russell <arussell123@gmail.com> | 2020-01-03 08:40:15 -0500 |
|---|---|---|
| committer | Andy Russell <arussell123@gmail.com> | 2020-01-03 08:40:15 -0500 |
| commit | 7fd014d56986d7b52c49f07fb8db9529059d839d (patch) | |
| tree | dc8dc7e50c16e5c87aeadc1a3964f17ae64cf2c7 /src/librustc_parse | |
| parent | 0a58f5864659ddfe1d95c122abaa75c88220aed0 (diff) | |
| download | rust-7fd014d56986d7b52c49f07fb8db9529059d839d.tar.gz rust-7fd014d56986d7b52c49f07fb8db9529059d839d.zip | |
tweak wording of mismatched delimiter errors
Diffstat (limited to 'src/librustc_parse')
| -rw-r--r-- | src/librustc_parse/lexer/tokentrees.rs | 10 | ||||
| -rw-r--r-- | src/librustc_parse/parser/mod.rs | 8 |
2 files changed, 9 insertions, 9 deletions
diff --git a/src/librustc_parse/lexer/tokentrees.rs b/src/librustc_parse/lexer/tokentrees.rs index 5beda290b91..a28bff3babf 100644 --- a/src/librustc_parse/lexer/tokentrees.rs +++ b/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) } _ => { diff --git a/src/librustc_parse/parser/mod.rs b/src/librustc_parse/parser/mod.rs index 6dcffcf0bd7..a2fa335cf72 100644 --- a/src/librustc_parse/parser/mod.rs +++ b/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) } |
