make test more reliable, rename all_traits -> all_traits_including_private

Author: Qelxiros

compiler/rustc_hir_analysis/src/hir_ty_lowering/mod.rs

@@ -1588,7 +1588,7 @@ impl<'tcx> dyn HirTyLowerer<'tcx> + '_ {
             &infcx_
         };
 
-        tcx.all_traits()
+        tcx.all_traits_including_private()
             .filter(|trait_def_id| {
                 // Consider only traits with the associated type
                 tcx.associated_items(*trait_def_id)

compiler/rustc_hir_typeck/src/method/suggest.rs

@@ -1725,7 +1725,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
             if unsatisfied_predicates.is_empty()
                 // ...or if we already suggested that name because of `rustc_confusable` annotation
                 && Some(similar_candidate.name()) != confusable_suggested
-                // and if the we aren't in an expansion.
+                // and if we aren't in an expansion.
                 && !span.from_expansion()
             {
                 self.find_likely_intended_associated_item(
@@ -3480,7 +3480,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
         mut valid_out_of_scope_traits: Vec<DefId>,
         explain: bool,
     ) -> bool {
-        valid_out_of_scope_traits.retain(|id| !self.tcx.is_private_dep(id.krate));
+        valid_out_of_scope_traits.retain(|id| self.tcx.is_user_visible_dep(id.krate));
         if !valid_out_of_scope_traits.is_empty() {
             let mut candidates = valid_out_of_scope_traits;
             candidates.sort_by_key(|id| self.tcx.def_path_str(id));
@@ -4385,7 +4385,7 @@ pub(crate) struct TraitInfo {
 /// Retrieves all traits in this crate and any dependent crates,
 /// and wraps them into `TraitInfo` for custom sorting.
 pub(crate) fn all_traits(tcx: TyCtxt<'_>) -> Vec<TraitInfo> {
-    tcx.all_traits().map(|def_id| TraitInfo { def_id }).collect()
+    tcx.all_traits_including_private().map(|def_id| TraitInfo { def_id }).collect()
 }
 
 fn print_disambiguation_help<'tcx>(

compiler/rustc_middle/src/ty/context.rs

@@ -2318,7 +2318,7 @@ impl<'tcx> TyCtxt<'tcx> {
     }
 
     /// All traits in the crate graph, including those not visible to the user.
-    pub fn all_traits(self) -> impl Iterator<Item = DefId> {
+    pub fn all_traits_including_private(self) -> impl Iterator<Item = DefId> {
         iter::once(LOCAL_CRATE)
             .chain(self.crates(()).iter().copied())
             .flat_map(move |cnum| self.traits(cnum).iter().copied())

compiler/rustc_smir/src/rustc_smir/context.rs

@@ -130,7 +130,11 @@ impl<'tcx> SmirCtxt<'tcx> {
 
     pub fn all_trait_decls(&self) -> stable_mir::TraitDecls {
         let mut tables = self.0.borrow_mut();
-        tables.tcx.all_traits().map(|trait_def_id| tables.trait_def(trait_def_id)).collect()
+        tables
+            .tcx
+            .all_traits_including_private()
+            .map(|trait_def_id| tables.trait_def(trait_def_id))
+            .collect()
     }
 
     pub fn trait_decls(&self, crate_num: CrateNum) -> stable_mir::TraitDecls {

compiler/rustc_trait_selection/src/error_reporting/traits/fulfillment_errors.rs

@@ -1850,7 +1850,7 @@ impl<'a, 'tcx> TypeErrCtxt<'a, 'tcx> {
         let trait_def_id = trait_pred.def_id();
         let trait_name = self.tcx.item_name(trait_def_id);
         let crate_name = self.tcx.crate_name(trait_def_id.krate);
-        if let Some(other_trait_def_id) = self.tcx.all_traits().find(|def_id| {
+        if let Some(other_trait_def_id) = self.tcx.all_traits_including_private().find(|def_id| {
             trait_name == self.tcx.item_name(trait_def_id)
                 && trait_def_id.krate != def_id.krate
                 && crate_name == self.tcx.crate_name(def_id.krate)

tests/ui/typeck/dont-suggest-private-dependencies.rs

@@ -1,4 +1,9 @@
 // Don't suggest importing a function from a private dependency.
+// Issues: #138191, #142676
+
+// Avoid suggesting traits from std-private deps
+//@ forbid-output: compiler_builtins
+//@ forbid-output: object
 
 struct VecReader(Vec<u8>);
 

tests/ui/typeck/dont-suggest-private-dependencies.stderr

@@ -1,5 +1,5 @@
 error[E0599]: no method named `read` found for struct `Vec<u8>` in the current scope
-  --> $DIR/dont-suggest-private-dependencies.rs:7:16
+  --> $DIR/dont-suggest-private-dependencies.rs:12:16
    |
 LL |         self.0.read(buf)
    |                ^^^^
@@ -10,7 +10,7 @@ LL |         self.0.read_at(buf)
    |                    +++
 
 error[E0599]: no function or associated item named `cast_from_lossy` found for type `u8` in the current scope
-  --> $DIR/dont-suggest-private-dependencies.rs:13:17
+  --> $DIR/dont-suggest-private-dependencies.rs:18:17
    |
 LL |     let _ = u8::cast_from_lossy(9);
    |                 ^^^^^^^^^^^^^^^ function or associated item not found in `u8`