Skip to content

Commit

Permalink
Check FromIterator trait impl in prelude collision check.
Browse files Browse the repository at this point in the history
  • Loading branch information
m-ou-se committed Jul 7, 2021
1 parent c5e344f commit 6053544
Show file tree
Hide file tree
Showing 3 changed files with 23 additions and 0 deletions.
1 change: 1 addition & 0 deletions compiler/rustc_span/src/symbol.rs
Expand Up @@ -155,6 +155,7 @@ symbols! {
FormatSpec,
Formatter,
From,
FromIterator,
Future,
FxHashMap,
FxHashSet,
Expand Down
21 changes: 21 additions & 0 deletions compiler/rustc_typeck/src/check/method/prelude2021.rs
Expand Up @@ -4,11 +4,13 @@ use hir::ItemKind;
use rustc_ast::Mutability;
use rustc_errors::Applicability;
use rustc_hir as hir;
use rustc_middle::ty::subst::InternalSubsts;
use rustc_middle::ty::{Ref, Ty};
use rustc_session::lint::builtin::RUST_2021_PRELUDE_COLLISIONS;
use rustc_span::symbol::kw::Underscore;
use rustc_span::symbol::{sym, Ident};
use rustc_span::Span;
use rustc_trait_selection::infer::InferCtxtExt;

use crate::check::{
method::probe::{self, Pick},
Expand Down Expand Up @@ -206,6 +208,25 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
return;
}

// For from_iter, check if the type actualy implements FromIterator.
// If we know it does not, we don't need to warn.
if method_name.name == sym::from_iter {
if let Some(trait_def_id) = self.tcx.get_diagnostic_item(sym::FromIterator) {
if !self
.infcx
.type_implements_trait(
trait_def_id,
self_ty,
InternalSubsts::empty(),
self.param_env,
)
.may_apply()
{
return;
}
}
}

// No need to lint if this is an inherent method called on a specific type, like `Vec::foo(...)`,
// since such methods take precedence over trait methods.
if matches!(pick.kind, probe::PickKind::InherentImplPick) {
Expand Down
1 change: 1 addition & 0 deletions library/core/src/iter/traits/collect.rs
Expand Up @@ -89,6 +89,7 @@
over elements of type `{A}`",
label = "value of type `{Self}` cannot be built from `std::iter::Iterator<Item={A}>`"
)]
#[rustc_diagnostic_item = "FromIterator"]
pub trait FromIterator<A>: Sized {
/// Creates a value from an iterator.
///
Expand Down

0 comments on commit 6053544

Please sign in to comment.