bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Disable future_prelude_collision for 2021 edition

Browse source
This commit is contained in:
jam1garner 2021-05-26 00:53:30 -04:00 • committed by Niko Matsakis
parent 79388aa067
commit 01bdb8e38a
1 changed files with 43 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

6
compiler/rustc_typeck/src/check/method/mod.rs
View file

@ -22,6 +22,7 @@ use rustc_middle::ty::subst::{InternalSubsts, SubstsRef};
use rustc_middle::ty::GenericParamDefKind; use rustc_middle::ty::GenericParamDefKind;
use rustc_middle::ty::{self, ToPolyTraitRef, ToPredicate, Ty, TypeFoldable, WithConstness}; use rustc_middle::ty::{self, ToPolyTraitRef, ToPredicate, Ty, TypeFoldable, WithConstness};
use rustc_session::lint::builtin::FUTURE_PRELUDE_COLLISION; use rustc_session::lint::builtin::FUTURE_PRELUDE_COLLISION;
use rustc_span::edition::Edition;
use rustc_span::symbol::{sym, Ident}; use rustc_span::symbol::{sym, Ident};
use rustc_span::Span; use rustc_span::Span;
use rustc_trait_selection::traits; use rustc_trait_selection::traits;
@ -199,9 +200,11 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
let pick = let pick =
self.lookup_probe(span, segment.ident, self_ty, call_expr, ProbeScope::TraitsInScope)?; self.lookup_probe(span, segment.ident, self_ty, call_expr, ProbeScope::TraitsInScope)?;
if span.edition() < Edition::Edition2021 {
if let sym::try_from | sym::try_into = segment.ident.name { if let sym::try_from | sym::try_into = segment.ident.name {
if let probe::PickKind::TraitPick = pick.kind { if let probe::PickKind::TraitPick = pick.kind {
if !matches!(self.tcx.crate_name(pick.item.def_id.krate), sym::std | sym::core) { if !matches!(self.tcx.crate_name(pick.item.def_id.krate), sym::std | sym::core)
{
self.tcx.struct_span_lint_hir( self.tcx.struct_span_lint_hir(
FUTURE_PRELUDE_COLLISION, FUTURE_PRELUDE_COLLISION,
call_expr.hir_id, call_expr.hir_id,
@ -244,6 +247,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
} }
} }
} }
}
for import_id in &pick.import_ids { for import_id in &pick.import_ids {
debug!("used_trait_import: {:?}", import_id); debug!("used_trait_import: {:?}", import_id);