nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2025-05-14 02:49:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix missing generic parameters from future_prelude_collision lint suggestion

Browse Source
This commit is contained in:
jam1garner 2021-05-27 14:54:16 -04:00 committed by Niko Matsakis
parent eb5e0af3a9
commit 93c60f26bf
1 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
compiler/rustc_typeck/src/check/method/mod.rs
View File

@ -544,7 +544,19 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
if let probe::PickKind::TraitPick = pick.kind {
if !matches!(tcx.crate_name(pick.item.def_id.krate), sym::std | sym::core) {
tcx.struct_span_lint_hir(FUTURE_PRELUDE_COLLISION, expr_id, span, |lint| {
let trait_name = tcx.def_path_str(pick.item.container.assert_trait());
let trait_def_id = pick.item.container.assert_trait();
let trait_generics = tcx.generics_of(trait_def_id);
let parameter_count = trait_generics.count() - (trait_generics.has_self as usize);
let trait_name = if parameter_count == 0 {
tcx.def_path_str(trait_def_id)
} else {
format!(
"{}<{}>",
tcx.def_path_str(trait_def_id),
std::iter::repeat("_").take(parameter_count).collect::<Vec<_>>().join(", ")
)
};
let mut lint = lint.build(&format!(
"trait-associated function `{}` will become ambiguous in Rust 2021",