bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

comments feedback

Browse source
This commit is contained in:
yukang 2023-01-06 07:44:10 +08:00
parent 1a0a6132a8
commit ce4afed2ef
1 changed files with 50 additions and 49 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -211,10 +211,13 @@ pub trait TypeErrCtxtExt<'tcx> {
obligation: &PredicateObligation<'tcx>, obligation: &PredicateObligation<'tcx>,
err: &mut Diagnostic, err: &mut Diagnostic,
trait_pred: ty::PolyTraitPredicate<'tcx>, trait_pred: ty::PolyTraitPredicate<'tcx>,
); ) -> bool;
fn suggest_add_reference_to_arg( fn suggest_add_reference_to_arg(
&self,
obligation: &PredicateObligation<'tcx>,
err: &mut Diagnostic, err: &mut Diagnostic,
trait_pred: ty::PolyTraitPredicate<'tcx>,
has_custom_message: bool, has_custom_message: bool,
) -> bool; ) -> bool;
@ -1112,20 +1115,17 @@ impl<'tcx> TypeErrCtxtExt<'tcx> for TypeErrCtxt<'_, 'tcx> {
err: &mut Diagnostic, err: &mut Diagnostic,
trait_pred: ty::PolyTraitPredicate<'tcx>, trait_pred: ty::PolyTraitPredicate<'tcx>,
) -> bool { ) -> bool {
let span = obligation.cause.span;
let body_id = obligation.cause.body_id;
let self_ty = self.resolve_vars_if_possible(trait_pred.self_ty()); let self_ty = self.resolve_vars_if_possible(trait_pred.self_ty());
let ty = self.tcx.erase_late_bound_regions(self_ty); let ty = self.tcx.erase_late_bound_regions(self_ty);
let owner = self.tcx.hir().get_parent_item(body_id); let owner = self.tcx.hir().get_parent_item(obligation.cause.body_id);
if let ObligationCauseCode::FunctionArgumentObligation { arg_hir_id, .. } = obligation.cause.code() && let Some(generics) = self.tcx.hir().get_generics(owner.def_id) else { return false };
let arg_node = self.tcx.hir().get(*arg_hir_id) && let ty::Ref(_, inner_ty, hir::Mutability::Not) = ty.kind() else { return false };
let Node::Expr(Expr { kind: hir::ExprKind::Path(_), ..}) = arg_node && let ty::Param(param) = inner_ty.kind() else { return false };
let Some(generics) = self.tcx.hir().get_generics(owner.def_id) && let Some(generic_param) = generics.get_named(param.name) else { return false };
let ty::Ref(_, inner_ty, hir::Mutability::Not) = ty.kind() && let ObligationCauseCode::FunctionArgumentObligation { arg_hir_id, .. } = obligation.cause.code() else { return false };
let ty::Param(param) = inner_ty.kind() && let arg_node = self.tcx.hir().get(*arg_hir_id);
let Some(generic_param) = let Node::Expr(Expr { kind: hir::ExprKind::Path(_), ..}) = arg_node else { return false };
generics.params.iter().find(|p| p.name.ident().as_str() == param.name.as_str())
{
let clone_trait = self.tcx.require_lang_item(LangItem::Clone, None); let clone_trait = self.tcx.require_lang_item(LangItem::Clone, None);
let has_clone = self let has_clone = self
.type_implements_trait(clone_trait, [ty], obligation.param_env) .type_implements_trait(clone_trait, [ty], obligation.param_env)
@ -1139,10 +1139,12 @@ impl<'tcx> TypeErrCtxtExt<'tcx> for TypeErrCtxt<'_, 'tcx> {
); );
if has_clone && self.predicate_may_hold(&new_obligation) { if has_clone && self.predicate_may_hold(&new_obligation) {
let clone_bound = generics.bounds_for_param(generic_param.def_id) let clone_bound = generics
.bounds_for_param(generic_param.def_id)
.flat_map(|bp| bp.bounds) .flat_map(|bp| bp.bounds)
.any(|bound| { .any(|bound| {
if let hir::GenericBound::Trait( hir::PolyTraitRef { trait_ref, ..}, ..) = bound { if let hir::GenericBound::Trait(hir::PolyTraitRef { trait_ref, .. }, ..) = bound
{
Some(clone_trait) == trait_ref.trait_def_id() Some(clone_trait) == trait_ref.trait_def_id()
} else { } else {
false false
@ -1155,18 +1157,17 @@ impl<'tcx> TypeErrCtxtExt<'tcx> for TypeErrCtxt<'_, 'tcx> {
err, err,
param.name.as_str(), param.name.as_str(),
"Clone", "Clone",
Some(clone_trait) Some(clone_trait),
); );
} }
err.span_suggestion_verbose( err.span_suggestion_verbose(
span.shrink_to_hi(), obligation.cause.span.shrink_to_hi(),
"consider using clone here", "consider using clone here",
".clone()".to_string(), ".clone()".to_string(),
Applicability::MaybeIncorrect, Applicability::MaybeIncorrect,
); );
return true; return true;
} }
}
false false
} }