bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Adding if to prevent borrowing suggestion in structs #71136

Browse source
This commit is contained in:
Kevin Per 2020-05-03 11:00:25 +02:00
parent 7184d137f6
commit dfbc143e65
1 changed files with 46 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

52
src/librustc_trait_selection/traits/error_reporting/suggestions.rs
View file

@ -562,6 +562,7 @@ impl<'a, 'tcx> InferCtxtExt<'tcx> for InferCtxt<'a, 'tcx> {
param_env,
new_trait_ref.without_const().to_predicate(),
);
if self.predicate_must_hold_modulo_regions(&new_obligation) {
if let Ok(snippet) = self.tcx.sess.source_map().span_to_snippet(span) {
// We have a very specific type of error, where just borrowing this argument
@ -569,6 +570,34 @@ impl<'a, 'tcx> InferCtxtExt<'tcx> for InferCtxt<'a, 'tcx> {
// original type obligation, not the last one that failed, which is arbitrary.
// Because of this, we modify the error to refer to the original obligation and
// return early in the caller.
let has_colon = self
.tcx
.sess
.source_map()
.span_to_snippet(span)
.map(|w| w.contains(":"))
.unwrap_or(false);
let has_double_colon = self
.tcx
.sess
.source_map()
.span_to_snippet(span)
.map(|w| w.contains("::"))
.unwrap_or(false);
let has_bracket = self
.tcx
.sess
.source_map()
.span_to_snippet(span)
.map(|w| w.contains("{"))
.unwrap_or(false);
let msg = format!(
"the trait bound `{}: {}` is not satisfied",
found,
@ -591,12 +620,23 @@ impl<'a, 'tcx> InferCtxtExt<'tcx> for InferCtxt<'a, 'tcx> {
obligation.parent_trait_ref.skip_binder().print_only_trait_path(),
),
);
err.span_suggestion(
span,
"consider borrowing here",
format!("&{}", snippet),
Applicability::MaybeIncorrect,
);
// This if is to prevent a special edge-case
if !has_colon || has_double_colon || has_bracket {
// We don't want a borrowing suggestion on the fields in structs,
// ```
// struct Foo {
// the_foos: Vec<Foo>
// }
// ```
err.span_suggestion(
span,
"consider borrowing here",
format!("&{}", snippet),
Applicability::MaybeIncorrect,
);
}
return true;
}
}