bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Implement jackh726's suggestions

Browse source
This commit is contained in:
Fabian Wolff 2021-05-17 22:58:09 +02:00
parent 48d07d1326
commit 572bb13ae5
7 changed files with 137 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -689,17 +689,11 @@ impl<'a, 'tcx> InferCtxtExt<'tcx> for InferCtxt<'a, 'tcx> {
// Blacklist traits for which it would be nonsensical to suggest borrowing.
// For instance, immutable references are always Copy, so suggesting to
// borrow would always succeed, but it's probably not what the user wanted.
let blacklist: Vec<_> = [
LangItem::Copy,
LangItem::Clone,
LangItem::Pin,
LangItem::Unpin,
LangItem::Sized,
LangItem::Send,
]
.iter()
.filter_map(|lang_item| self.tcx.lang_items().require(*lang_item).ok())
.collect();
let blacklist: Vec<_> =
[LangItem::Copy, LangItem::Clone, LangItem::Unpin, LangItem::Sized, LangItem::Send]
.iter()
.filter_map(|lang_item| self.tcx.lang_items().require(*lang_item).ok())
.collect();
let span = obligation.cause.span;
let param_env = obligation.param_env;
@ -771,7 +765,7 @@ impl<'a, 'tcx> InferCtxtExt<'tcx> for InferCtxt<'a, 'tcx> {
err.span_suggestion(
span,
&format!(
"consider borrowing{} here",
"consider{} borrowing here",
if mtbl { " mutably" } else { "" }
),
format!("&{}{}", if mtbl { "mut " } else { "" }, snippet),