From 4943688e9d0d0f34f2fda188e9a9d2777f90d186 Mon Sep 17 00:00:00 2001 From: Noah Lev Date: Wed, 23 Mar 2022 19:47:45 -0700 Subject: Fix from rebase I changed the test functions to be `pub` rather than called from a `main` function too, for easier future modification of tests. --- compiler/rustc_parse/src/parser/diagnostics.rs | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'compiler/rustc_parse/src/parser') diff --git a/compiler/rustc_parse/src/parser/diagnostics.rs b/compiler/rustc_parse/src/parser/diagnostics.rs index bab4ac9d08a..9bf67231278 100644 --- a/compiler/rustc_parse/src/parser/diagnostics.rs +++ b/compiler/rustc_parse/src/parser/diagnostics.rs @@ -17,7 +17,7 @@ use rustc_ast::{ }; use rustc_ast_pretty::pprust; use rustc_data_structures::fx::FxHashSet; -use rustc_errors::{pluralize, struct_span_err, Diagnostic, ErrorGuaranteed}; +use rustc_errors::{pluralize, struct_span_err, Diagnostic, EmissionGuarantee, ErrorGuaranteed}; use rustc_errors::{Applicability, DiagnosticBuilder, Handler, PResult}; use rustc_span::source_map::Spanned; use rustc_span::symbol::{kw, Ident}; @@ -225,13 +225,13 @@ struct MultiSugg { } impl MultiSugg { - fn emit(self, err: &mut DiagnosticBuilder<'_>) { + fn emit(self, err: &mut DiagnosticBuilder<'_, G>) { err.multipart_suggestion(&self.msg, self.patches, self.applicability); } /// Overrides individual messages and applicabilities. - fn emit_many( - err: &mut DiagnosticBuilder<'_>, + fn emit_many( + err: &mut DiagnosticBuilder<'_, G>, msg: &str, applicability: Applicability, suggestions: impl Iterator, @@ -1289,7 +1289,7 @@ impl<'a> Parser<'a> { ); err.span_label(op_span, &format!("not a valid {} operator", kind.fixity)); - let help_base_case = |mut err: DiagnosticBuilder<'_>, base| { + let help_base_case = |mut err: DiagnosticBuilder<'_, _>, base| { err.help(&format!("use `{}= 1` instead", kind.op.chr())); err.emit(); Ok(base) -- cgit 1.4.1-3-g733a5