diff options
| author | Matthias Krüger <matthias.krueger@famsik.de> | 2022-10-01 16:45:05 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-10-01 16:45:05 +0200 |
| commit | cc009bc5364ec183e47e165c1afeb37e48af9ffe (patch) | |
| tree | 66aef1f525ca1c9b2b48778facf9f18434876aa5 /compiler/rustc_parse/src/parser/diagnostics.rs | |
| parent | 21fc2185325fcf6f1a002e4c0c015fecff2ac888 (diff) | |
| parent | 85a726e7540b801924cfb207e7b5714e00080471 (diff) | |
| download | rust-cc009bc5364ec183e47e165c1afeb37e48af9ffe.tar.gz rust-cc009bc5364ec183e47e165c1afeb37e48af9ffe.zip | |
Rollup merge of #102500 - compiler-errors:parse-sess-cleanup, r=cjgillot
Remove `expr_parentheses_needed` from `ParseSess` Not sure why this method needed to exist on `ParseSess`, but we can achieve the same behavior by just inlining it everywhere.
Diffstat (limited to 'compiler/rustc_parse/src/parser/diagnostics.rs')
| -rw-r--r-- | compiler/rustc_parse/src/parser/diagnostics.rs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/compiler/rustc_parse/src/parser/diagnostics.rs b/compiler/rustc_parse/src/parser/diagnostics.rs index b512f26335f..f57bd9cec19 100644 --- a/compiler/rustc_parse/src/parser/diagnostics.rs +++ b/compiler/rustc_parse/src/parser/diagnostics.rs @@ -33,6 +33,7 @@ use rustc_errors::{ fluent, Applicability, DiagnosticBuilder, DiagnosticMessage, Handler, MultiSpan, PResult, }; use rustc_errors::{pluralize, Diagnostic, ErrorGuaranteed, IntoDiagnostic}; +use rustc_session::errors::ExprParenthesesNeeded; use rustc_span::source_map::Spanned; use rustc_span::symbol::{kw, sym, Ident}; use rustc_span::{Span, SpanSnippetError, DUMMY_SP}; @@ -2049,7 +2050,7 @@ impl<'a> Parser<'a> { let mut err = self.struct_span_err(span, &msg); let sp = self.sess.source_map().start_point(self.token.span); if let Some(sp) = self.sess.ambiguous_block_expr_parse.borrow().get(&sp) { - self.sess.expr_parentheses_needed(&mut err, *sp); + err.subdiagnostic(ExprParenthesesNeeded::surrounding(*sp)); } err.span_label(span, "expected expression"); err |
