bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Use proper subdiagnostic

Browse source
This commit is contained in:
Michael Goulet 2022-10-05 19:55:19 +00:00
parent 8e7783bd13
commit fe0533638c
1 changed files with 9 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

24
compiler/rustc_lint/src/opaque_hidden_inferred_bound.rs
View file

@ -1,4 +1,3 @@
use rustc_errors::DecorateLint;
use rustc_hir as hir; use rustc_hir as hir;
use rustc_infer::infer::TyCtxtInferExt; use rustc_infer::infer::TyCtxtInferExt;
use rustc_macros::{LintDiagnostic, Subdiagnostic}; use rustc_macros::{LintDiagnostic, Subdiagnostic};
@ -120,7 +119,7 @@ impl<'tcx> LateLintPass<'tcx> for OpaqueHiddenInferredBound {
)) { )) {
// If it's a trait bound and an opaque that doesn't satisfy it, // If it's a trait bound and an opaque that doesn't satisfy it,
// then we can emit a suggestion to add the bound. // then we can emit a suggestion to add the bound.
let sugg = let add_bound =
match (proj_term.kind(), assoc_pred.kind().skip_binder()) { match (proj_term.kind(), assoc_pred.kind().skip_binder()) {
(ty::Opaque(def_id, _), ty::PredicateKind::Trait(trait_pred)) => Some(AddBound { (ty::Opaque(def_id, _), ty::PredicateKind::Trait(trait_pred)) => Some(AddBound {
suggest_span: cx.tcx.def_span(*def_id).shrink_to_hi(), suggest_span: cx.tcx.def_span(*def_id).shrink_to_hi(),
@ -128,21 +127,14 @@ impl<'tcx> LateLintPass<'tcx> for OpaqueHiddenInferredBound {
}), }),
_ => None, _ => None,
}; };
let lint = OpaqueHiddenInferredBoundLint { cx.emit_spanned_lint(
ty: cx.tcx.mk_opaque(def_id, ty::InternalSubsts::identity_for_item(cx.tcx, def_id)),
proj_ty: proj_term,
assoc_pred_span,
};
cx.struct_span_lint(
OPAQUE_HIDDEN_INFERRED_BOUND, OPAQUE_HIDDEN_INFERRED_BOUND,
pred_span, pred_span,
lint.msg(), OpaqueHiddenInferredBoundLint {
|diag| { ty: cx.tcx.mk_opaque(def_id, ty::InternalSubsts::identity_for_item(cx.tcx, def_id)),
lint.decorate_lint(diag); proj_ty: proj_term,
if let Some(sugg) = sugg { assoc_pred_span,
diag.subdiagnostic(sugg); add_bound,
}
diag
}, },
); );
} }
@ -159,6 +151,8 @@ struct OpaqueHiddenInferredBoundLint<'tcx> {
proj_ty: Ty<'tcx>, proj_ty: Ty<'tcx>,
#[label(lint::specifically)] #[label(lint::specifically)]
assoc_pred_span: Span, assoc_pred_span: Span,
#[subdiagnostic]
add_bound: Option<AddBound<'tcx>>,
} }
#[derive(Subdiagnostic)] #[derive(Subdiagnostic)]