address review

Author: LorrensP-2158466

compiler/rustc_hir/src/hir.rs

@@ -4555,7 +4555,10 @@ pub struct Upvar {
 pub struct TraitCandidate {
     pub def_id: DefId,
     pub import_ids: SmallVec<[LocalDefId; 1]>,
-    // FIXME: explain why this is needed for now.
+    // Indicates whether this trait candidate is ambiguously glob imported
+    // in it's scope. Related to the AMBIGUOUS_GLOB_IMPORTED_TRAIT lint.
+    // If this is set to true and the trait is used as a result of methdo lookup, this
+    // lint is thrown.
     pub lint_ambiguous: bool,
 }
 

compiler/rustc_hir_typeck/src/method/confirm.rs

@@ -13,7 +13,7 @@ use rustc_hir_analysis::hir_ty_lowering::{
 use rustc_infer::infer::{
     BoundRegionConversionTime, DefineOpaqueTypes, InferOk, RegionVariableOrigin,
 };
-use rustc_lint::builtin::{AMBIGUOUS_TRAIT_GLOB_IMPORTS, SUPERTRAIT_ITEM_SHADOWING_USAGE};
+use rustc_lint::builtin::{AMBIGUOUS_GLOB_IMPORTED_TRAIT, SUPERTRAIT_ITEM_SHADOWING_USAGE};
 use rustc_middle::traits::ObligationCauseCode;
 use rustc_middle::ty::adjustment::{
     Adjust, Adjustment, AllowTwoPhase, AutoBorrow, AutoBorrowMutability, PointerCoercion,
@@ -725,14 +725,13 @@ impl<'a, 'tcx> ConfirmContext<'a, 'tcx> {
         pick: &probe::Pick<'_>,
         segment: &hir::PathSegment<'tcx>,
     ) {
-        if let probe::PickKind::TraitPick(true) = pick.kind {
-        } else {
+        if pick.kind != probe::PickKind::TraitPick(true) {
             return;
-        };
+        }
         let trait_name = self.tcx.item_name(pick.item.container_id(self.tcx));
         let import_span = self.tcx.hir_span_if_local(pick.import_ids[0].to_def_id()).unwrap();
 
-        self.tcx.node_lint(AMBIGUOUS_TRAIT_GLOB_IMPORTS, segment.hir_id, |diag| {
+        self.tcx.node_lint(AMBIGUOUS_GLOB_IMPORTED_TRAIT, segment.hir_id, |diag| {
             diag.primary_message(format!("Use of ambiguously glob imported trait `{trait_name}`"))
                 .span(segment.ident.span)
                 .span_label(import_span, format!("`{trait_name}`imported ambiguously here"))

compiler/rustc_lint_defs/src/builtin.rs

@@ -19,9 +19,9 @@ declare_lint_pass! {
         AARCH64_SOFTFLOAT_NEON,
         ABSOLUTE_PATHS_NOT_STARTING_WITH_CRATE,
         AMBIGUOUS_ASSOCIATED_ITEMS,
+        AMBIGUOUS_GLOB_IMPORTED_TRAIT,
         AMBIGUOUS_GLOB_IMPORTS,
         AMBIGUOUS_GLOB_REEXPORTS,
-        AMBIGUOUS_TRAIT_GLOB_IMPORTS,
         ARITHMETIC_OVERFLOW,
         ASM_SUB_REGISTER,
         BAD_ASM_STYLE,
@@ -4483,7 +4483,7 @@ declare_lint! {
     /// hard error in the future.
     ///
     /// [future-incompatible]: ../index.md#future-incompatible-lints
-    pub AMBIGUOUS_TRAIT_GLOB_IMPORTS,
+    pub AMBIGUOUS_GLOB_IMPORTED_TRAIT,
     Warn,
     "detects usages of ambiguously glob imported traits",
     @future_incompatible = FutureIncompatibleInfo {