bjoernager/rust
bjoernager/rust
1
Fork 0
Code Issues Pull requests Activity

Suggest only when Rhs for PartialEq and PartialOrd is the same type as self

Browse source
This commit is contained in:
ohno418 2022-04-01 11:28:28 +09:00
parent 0d2a00058b
commit 0ff2f58330
1 changed files with 30 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

58
compiler/rustc_trait_selection/src/traits/error_reporting/suggestions.rs
View file

@ -2593,35 +2593,37 @@ impl<'a, 'tcx> InferCtxtExt<'tcx> for InferCtxt<'a, 'tcx> {
} }
fn suggest_derive(&self, err: &mut Diagnostic, trait_pred: ty::PolyTraitPredicate<'tcx>) { fn suggest_derive(&self, err: &mut Diagnostic, trait_pred: ty::PolyTraitPredicate<'tcx>) {
if let Some(diagnostic_name) = self.tcx.get_diagnostic_name(trait_pred.def_id()) { let Some(diagnostic_name) = self.tcx.get_diagnostic_name(trait_pred.def_id()) else {
let adt = match trait_pred.skip_binder().self_ty().ty_adt_def() { return;
Some(adt) if adt.did().is_local() => adt, };
_ => return, let Some(self_ty) = trait_pred.self_ty().no_bound_vars() else {
}; return;
let can_derive = match diagnostic_name { };
sym::Default => !adt.is_enum(),
sym::Eq let adt = match self_ty.ty_adt_def() {
| sym::PartialEq Some(adt) if adt.did().is_local() => adt,
| sym::Ord _ => return,
| sym::PartialOrd };
| sym::Clone let can_derive = match diagnostic_name {
| sym::Copy sym::Default => !adt.is_enum(),
| sym::Hash sym::PartialEq | sym::PartialOrd => {
| sym::Debug => true, let rhs_ty = trait_pred.skip_binder().trait_ref.substs.type_at(1);
_ => false, self_ty == rhs_ty
};
if can_derive {
err.span_suggestion_verbose(
self.tcx.def_span(adt.did()).shrink_to_lo(),
&format!(
"consider annotating `{}` with `#[derive({})]`",
trait_pred.skip_binder().self_ty().to_string(),
diagnostic_name.to_string(),
),
format!("#[derive({})]\n", diagnostic_name.to_string()),
Applicability::MaybeIncorrect,
);
} }
sym::Eq | sym::Ord | sym::Clone | sym::Copy | sym::Hash | sym::Debug => true,
_ => false,
};
if can_derive {
err.span_suggestion_verbose(
self.tcx.def_span(adt.did()).shrink_to_lo(),
&format!(
"consider annotating `{}` with `#[derive({})]`",
trait_pred.skip_binder().self_ty().to_string(),
diagnostic_name.to_string(),
),
format!("#[derive({})]\n", diagnostic_name.to_string()),
Applicability::MaybeIncorrect,
);
} }
} }
} }