bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Suggest function borrow ignoring needs_note

Browse source 
`needs_note` is false if we've already suggested why the type is Copy...
but that has nothing to do with the diagnostic.
This commit is contained in:
Michael Goulet 2022-03-28 19:30:39 -07:00
parent a9b02e13a6
commit ac95e80186
9 changed files with 53 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
compiler/rustc_borrowck/src/diagnostics/conflict_errors.rs
View file

@ -284,10 +284,14 @@ impl<'cx, 'tcx> MirBorrowckCtxt<'cx, 'tcx> {
None => "value".to_owned(),
};
if self.suggest_borrow_fn_like(&mut err, ty, &move_site_vec, &note_msg) {
// Suppress the next note, since we don't want to put more `Fn`-like bounds onto something that already has them
} else if needs_note {
// Suppress the next suggestion since we don't want to put more bounds onto
// something that already has `Fn`-like bounds (or is a closure), so we can't
// restrict anyways.
} else {
self.suggest_adding_copy_bounds(&mut err, ty, span);
}
if needs_note {
let span = if let Some(local) = place.as_local() {
Some(self.body.local_decls[local].source_info.span)
} else {