privacy: normalize types before visiting

Ref #126076 (comment)

Author: jswrenn

Cargo.lock

@@ -4479,10 +4479,12 @@ dependencies = [
  "rustc_fluent_macro",
  "rustc_hir",
  "rustc_hir_analysis",
+ "rustc_infer",
  "rustc_macros",
  "rustc_middle",
  "rustc_session",
  "rustc_span",
+ "rustc_trait_selection",
  "rustc_ty_utils",
  "tracing",
 ]

compiler/rustc_privacy/Cargo.toml

@@ -12,10 +12,12 @@ rustc_errors = { path = "../rustc_errors" }
 rustc_fluent_macro = { path = "../rustc_fluent_macro" }
 rustc_hir = { path = "../rustc_hir" }
 rustc_hir_analysis = { path = "../rustc_hir_analysis" }
+rustc_infer = { path = "../rustc_infer" }
 rustc_macros = { path = "../rustc_macros" }
 rustc_middle = { path = "../rustc_middle" }
 rustc_session = { path = "../rustc_session" }
 rustc_span = { path = "../rustc_span" }
+rustc_trait_selection = { path = "../rustc_trait_selection" }
 rustc_ty_utils = { path = "../rustc_ty_utils" }
 tracing = "0.1"
 # tidy-alphabetical-end

compiler/rustc_privacy/src/lib.rs

@@ -23,14 +23,16 @@ use rustc_hir::intravisit::{self, Visitor};
 use rustc_hir::{AssocItemKind, ForeignItemKind, ItemId, ItemKind, PatKind};
 use rustc_middle::middle::privacy::{EffectiveVisibilities, EffectiveVisibility, Level};
 use rustc_middle::query::Providers;
-use rustc_middle::ty::GenericArgs;
 use rustc_middle::ty::{self, Const, GenericParamDefKind};
+use rustc_middle::ty::{GenericArgs, ParamEnv};
 use rustc_middle::ty::{TraitRef, Ty, TyCtxt, TypeSuperVisitable, TypeVisitable, TypeVisitor};
 use rustc_middle::{bug, span_bug};
 use rustc_session::lint;
 use rustc_span::hygiene::Transparency;
 use rustc_span::symbol::{kw, sym, Ident};
 use rustc_span::Span;
+use rustc_trait_selection::infer::TyCtxtInferExt;
+use rustc_trait_selection::traits::{ObligationCause, ObligationCtxt};
 
 use std::fmt;
 use std::marker::PhantomData;
@@ -1300,15 +1302,9 @@ impl SearchInterfaceForPrivateItemsVisitor<'_> {
         self.in_primary_interface = true;
         let ty = self.tcx.type_of(self.item_def_id).instantiate_identity();
 
-        // If `in_assoc_ty`, attempt to normalize `ty`.
-        // Ideally, we would normalize in all circumstances, but doing so
-        // currently causes some unexpected type errors.
-        let maybe_normalized_ty = if self.in_assoc_ty {
-            let param_env = self.tcx.param_env(self.item_def_id);
-            self.tcx.try_normalize_erasing_regions(param_env, ty).ok()
-        } else {
-            None
-        };
+        // Attempt to normalize `ty`
+        let param_env = self.tcx.param_env(self.item_def_id);
+        let maybe_normalized_ty = try_normalize(self.tcx, param_env, ty);
 
         self.visit(maybe_normalized_ty.unwrap_or(ty));
         self
@@ -1771,3 +1767,17 @@ fn check_private_in_public(tcx: TyCtxt<'_>, (): ()) {
         checker.check_item(id);
     }
 }
+
+/// Attempts to deeply normalize `ty`.
+fn try_normalize<'tcx>(
+    tcx: TyCtxt<'tcx>,
+    param_env: ParamEnv<'tcx>,
+    ty: Ty<'tcx>,
+) -> Result<Ty<'tcx>, ()> {
+    let infcx = tcx.infer_ctxt().with_next_trait_solver(true).build();
+    let ocx = ObligationCtxt::new(&infcx);
+    let cause = ObligationCause::dummy();
+    let Ok(ty) = ocx.deeply_normalize(&cause, param_env, ty) else { return Err(()) };
+    let errors = ocx.select_all_or_error();
+    if errors.is_empty() { Ok(ty) } else { Err(()) }
+}

tests/ui/associated-inherent-types/private-in-public.rs

@@ -5,9 +5,9 @@
 #![crate_type = "lib"]
 
 pub type PubAlias0 = PubTy::PrivAssocTy;
-//~^ WARNING associated type `PubTy::PrivAssocTy` is more private than the item `PubAlias0`
+
 pub type PubAlias1 = PrivTy::PubAssocTy;
-//~^ WARNING type `PrivTy` is more private than the item `PubAlias1`
+
 pub type PubAlias2 = PubTy::PubAssocTy<PrivTy>;
 //~^ WARNING type `PrivTy` is more private than the item `PubAlias2`
 

tests/ui/associated-inherent-types/private-in-public.stderr

@@ -1,28 +1,3 @@
-warning: associated type `PubTy::PrivAssocTy` is more private than the item `PubAlias0`
-  --> $DIR/private-in-public.rs:7:1
-   |
-LL | pub type PubAlias0 = PubTy::PrivAssocTy;
-   | ^^^^^^^^^^^^^^^^^^ type alias `PubAlias0` is reachable at visibility `pub`
-   |
-note: but associated type `PubTy::PrivAssocTy` is only usable at visibility `pub(crate)`
-  --> $DIR/private-in-public.rs:16:5
-   |
-LL |     type PrivAssocTy = ();
-   |     ^^^^^^^^^^^^^^^^
-   = note: `#[warn(private_interfaces)]` on by default
-
-warning: type `PrivTy` is more private than the item `PubAlias1`
-  --> $DIR/private-in-public.rs:9:1
-   |
-LL | pub type PubAlias1 = PrivTy::PubAssocTy;
-   | ^^^^^^^^^^^^^^^^^^ type alias `PubAlias1` is reachable at visibility `pub`
-   |
-note: but type `PrivTy` is only usable at visibility `pub(crate)`
-  --> $DIR/private-in-public.rs:20:1
-   |
-LL | struct PrivTy;
-   | ^^^^^^^^^^^^^
-
 warning: type `PrivTy` is more private than the item `PubAlias2`
   --> $DIR/private-in-public.rs:11:1
    |
@@ -34,6 +9,7 @@ note: but type `PrivTy` is only usable at visibility `pub(crate)`
    |
 LL | struct PrivTy;
    | ^^^^^^^^^^^^^
+   = note: `#[warn(private_interfaces)]` on by default
 
-warning: 3 warnings emitted
+warning: 1 warning emitted