DiagnosticBuilder -> Diagnostic
This commit is contained in:
parent
cc9b259b5e
commit
fbce7decd8
3 changed files with 13 additions and 19 deletions
|
@ -1,6 +1,4 @@
|
||||||
use rustc_errors::{
|
use rustc_errors::{Applicability, Diagnostic};
|
||||||
Applicability, Diagnostic, DiagnosticBuilder, EmissionGuarantee, ErrorGuaranteed,
|
|
||||||
};
|
|
||||||
use rustc_hir as hir;
|
use rustc_hir as hir;
|
||||||
use rustc_hir::intravisit::Visitor;
|
use rustc_hir::intravisit::Visitor;
|
||||||
use rustc_hir::Node;
|
use rustc_hir::Node;
|
||||||
|
@ -629,25 +627,20 @@ impl<'a, 'tcx> MirBorrowckCtxt<'a, 'tcx> {
|
||||||
self.buffer_error(err);
|
self.buffer_error(err);
|
||||||
}
|
}
|
||||||
|
|
||||||
fn suggest_map_index_mut_alternatives(
|
fn suggest_map_index_mut_alternatives(&self, ty: Ty<'tcx>, err: &mut Diagnostic, span: Span) {
|
||||||
&self,
|
|
||||||
ty: Ty<'_>,
|
|
||||||
err: &mut DiagnosticBuilder<'_, ErrorGuaranteed>,
|
|
||||||
span: Span,
|
|
||||||
) {
|
|
||||||
let Some(adt) = ty.ty_adt_def() else { return };
|
let Some(adt) = ty.ty_adt_def() else { return };
|
||||||
let did = adt.did();
|
let did = adt.did();
|
||||||
if self.infcx.tcx.is_diagnostic_item(sym::HashMap, did)
|
if self.infcx.tcx.is_diagnostic_item(sym::HashMap, did)
|
||||||
|| self.infcx.tcx.is_diagnostic_item(sym::BTreeMap, did)
|
|| self.infcx.tcx.is_diagnostic_item(sym::BTreeMap, did)
|
||||||
{
|
{
|
||||||
struct V<'a, 'b, 'tcx, G: EmissionGuarantee> {
|
struct V<'a, 'tcx> {
|
||||||
assign_span: Span,
|
assign_span: Span,
|
||||||
err: &'a mut DiagnosticBuilder<'b, G>,
|
err: &'a mut Diagnostic,
|
||||||
ty: Ty<'tcx>,
|
ty: Ty<'tcx>,
|
||||||
suggested: bool,
|
suggested: bool,
|
||||||
}
|
}
|
||||||
impl<'a, 'b: 'a, 'hir, 'tcx, G: EmissionGuarantee> Visitor<'hir> for V<'a, 'b, 'tcx, G> {
|
impl<'a, 'tcx> Visitor<'tcx> for V<'a, 'tcx> {
|
||||||
fn visit_stmt(&mut self, stmt: &'hir hir::Stmt<'hir>) {
|
fn visit_stmt(&mut self, stmt: &'tcx hir::Stmt<'tcx>) {
|
||||||
hir::intravisit::walk_stmt(self, stmt);
|
hir::intravisit::walk_stmt(self, stmt);
|
||||||
let expr = match stmt.kind {
|
let expr = match stmt.kind {
|
||||||
hir::StmtKind::Semi(expr) | hir::StmtKind::Expr(expr) => expr,
|
hir::StmtKind::Semi(expr) | hir::StmtKind::Expr(expr) => expr,
|
||||||
|
|
|
@ -87,6 +87,7 @@ use self::VarKind::*;
|
||||||
use rustc_ast::InlineAsmOptions;
|
use rustc_ast::InlineAsmOptions;
|
||||||
use rustc_data_structures::fx::FxIndexMap;
|
use rustc_data_structures::fx::FxIndexMap;
|
||||||
use rustc_errors::Applicability;
|
use rustc_errors::Applicability;
|
||||||
|
use rustc_errors::Diagnostic;
|
||||||
use rustc_hir as hir;
|
use rustc_hir as hir;
|
||||||
use rustc_hir::def::*;
|
use rustc_hir::def::*;
|
||||||
use rustc_hir::def_id::{DefId, LocalDefId};
|
use rustc_hir::def_id::{DefId, LocalDefId};
|
||||||
|
@ -1690,7 +1691,7 @@ impl<'tcx> Liveness<'_, 'tcx> {
|
||||||
&self,
|
&self,
|
||||||
name: &str,
|
name: &str,
|
||||||
opt_body: Option<&hir::Body<'_>>,
|
opt_body: Option<&hir::Body<'_>>,
|
||||||
err: &mut rustc_errors::DiagnosticBuilder<'_, ()>,
|
err: &mut Diagnostic,
|
||||||
) -> bool {
|
) -> bool {
|
||||||
let mut has_litstring = false;
|
let mut has_litstring = false;
|
||||||
let Some(opt_body) = opt_body else {return false;};
|
let Some(opt_body) = opt_body else {return false;};
|
||||||
|
|
|
@ -437,7 +437,7 @@ impl<'a: 'ast, 'ast> LateResolutionVisitor<'a, '_, 'ast> {
|
||||||
|
|
||||||
fn try_lookup_name_relaxed(
|
fn try_lookup_name_relaxed(
|
||||||
&mut self,
|
&mut self,
|
||||||
err: &mut DiagnosticBuilder<'_, ErrorGuaranteed>,
|
err: &mut Diagnostic,
|
||||||
source: PathSource<'_>,
|
source: PathSource<'_>,
|
||||||
path: &[Segment],
|
path: &[Segment],
|
||||||
span: Span,
|
span: Span,
|
||||||
|
@ -497,7 +497,7 @@ impl<'a: 'ast, 'ast> LateResolutionVisitor<'a, '_, 'ast> {
|
||||||
.contains(span)
|
.contains(span)
|
||||||
{
|
{
|
||||||
// Already reported this issue on the lhs of the type ascription.
|
// Already reported this issue on the lhs of the type ascription.
|
||||||
err.delay_as_bug();
|
err.downgrade_to_delayed_bug();
|
||||||
return (true, candidates);
|
return (true, candidates);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -616,7 +616,7 @@ impl<'a: 'ast, 'ast> LateResolutionVisitor<'a, '_, 'ast> {
|
||||||
|
|
||||||
fn suggest_trait_and_bounds(
|
fn suggest_trait_and_bounds(
|
||||||
&mut self,
|
&mut self,
|
||||||
err: &mut DiagnosticBuilder<'_, ErrorGuaranteed>,
|
err: &mut Diagnostic,
|
||||||
source: PathSource<'_>,
|
source: PathSource<'_>,
|
||||||
res: Option<Res>,
|
res: Option<Res>,
|
||||||
span: Span,
|
span: Span,
|
||||||
|
@ -691,7 +691,7 @@ impl<'a: 'ast, 'ast> LateResolutionVisitor<'a, '_, 'ast> {
|
||||||
|
|
||||||
fn suggest_typo(
|
fn suggest_typo(
|
||||||
&mut self,
|
&mut self,
|
||||||
err: &mut DiagnosticBuilder<'_, ErrorGuaranteed>,
|
err: &mut Diagnostic,
|
||||||
source: PathSource<'_>,
|
source: PathSource<'_>,
|
||||||
path: &[Segment],
|
path: &[Segment],
|
||||||
span: Span,
|
span: Span,
|
||||||
|
@ -750,7 +750,7 @@ impl<'a: 'ast, 'ast> LateResolutionVisitor<'a, '_, 'ast> {
|
||||||
|
|
||||||
fn err_code_special_cases(
|
fn err_code_special_cases(
|
||||||
&mut self,
|
&mut self,
|
||||||
err: &mut DiagnosticBuilder<'_, ErrorGuaranteed>,
|
err: &mut Diagnostic,
|
||||||
source: PathSource<'_>,
|
source: PathSource<'_>,
|
||||||
path: &[Segment],
|
path: &[Segment],
|
||||||
span: Span,
|
span: Span,
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue