Rollup merge of rust-lang#129732 - nnethercote:unreachable_pub-3, r=U…

…rgau

Add `unreachable_pub`, round 3

A follow-up to rust-lang#129648.

r? `@Urgau`

compiler/rustc_macros/src/diagnostics/mod.rs

@@ -55,7 +55,7 @@ use synstructure::Structure;
 ///
 /// See rustc dev guide for more examples on using the `#[derive(Diagnostic)]`:
 /// <https://rustc-dev-guide.rust-lang.org/diagnostics/diagnostic-structs.html>
-pub fn diagnostic_derive(mut s: Structure<'_>) -> TokenStream {
+pub(super) fn diagnostic_derive(mut s: Structure<'_>) -> TokenStream {
  s.underscore_const(true);
  DiagnosticDerive::new(s).into_tokens()
 }
@@ -102,7 +102,7 @@ pub fn diagnostic_derive(mut s: Structure<'_>) -> TokenStream {
 ///
 /// See rustc dev guide for more examples on using the `#[derive(LintDiagnostic)]`:
 /// <https://rustc-dev-guide.rust-lang.org/diagnostics/diagnostic-structs.html#reference>
-pub fn lint_diagnostic_derive(mut s: Structure<'_>) -> TokenStream {
+pub(super) fn lint_diagnostic_derive(mut s: Structure<'_>) -> TokenStream {
  s.underscore_const(true);
  LintDiagnosticDerive::new(s).into_tokens()
 }
@@ -153,7 +153,7 @@ pub fn lint_diagnostic_derive(mut s: Structure<'_>) -> TokenStream {
 ///
 /// diag.subdiagnostic(RawIdentifierSuggestion { span, applicability, ident });
 /// ```
-pub fn subdiagnostic_derive(mut s: Structure<'_>) -> TokenStream {
+pub(super) fn subdiagnostic_derive(mut s: Structure<'_>) -> TokenStream {
  s.underscore_const(true);
  SubdiagnosticDerive::new().into_tokens(s)
 }

compiler/rustc_macros/src/lib.rs

@@ -6,6 +6,7 @@
 #![feature(proc_macro_diagnostic)]
 #![feature(proc_macro_span)]
 #![feature(proc_macro_tracked_env)]
+#![warn(unreachable_pub)]
 // tidy-alphabetical-end
 
 use proc_macro::TokenStream;

compiler/rustc_macros/src/lift.rs

@@ -1,7 +1,7 @@
 use quote::quote;
 use syn::parse_quote;
 
-pub fn lift_derive(mut s: synstructure::Structure<'_>) -> proc_macro2::TokenStream {
+pub(super) fn lift_derive(mut s: synstructure::Structure<'_>) -> proc_macro2::TokenStream {
  s.add_bounds(synstructure::AddBounds::Generics);
  s.bind_with(|_| synstructure::BindStyle::Move);
  s.underscore_const(true);

compiler/rustc_macros/src/query.rs

@@ -307,7 +307,7 @@ fn add_query_desc_cached_impl(
  });
 }
 
-pub fn rustc_queries(input: TokenStream) -> TokenStream {
+pub(super) fn rustc_queries(input: TokenStream) -> TokenStream {
  let queries = parse_macro_input!(input as List<Query>);
 
  let mut query_stream = quote! {};

compiler/rustc_macros/src/serialize.rs

@@ -3,7 +3,9 @@ use quote::{quote, quote_spanned};
 use syn::parse_quote;
 use syn::spanned::Spanned;
 
-pub fn type_decodable_derive(mut s: synstructure::Structure<'_>) -> proc_macro2::TokenStream {
+pub(super) fn type_decodable_derive(
+ mut s: synstructure::Structure<'_>,
+) -> proc_macro2::TokenStream {
  let decoder_ty = quote! { __D };
  let bound = if s.ast().generics.lifetimes().any(|lt| lt.lifetime.ident == "tcx") {
  quote! { <I = ::rustc_middle::ty::TyCtxt<'tcx>> }
@@ -20,7 +22,9 @@ pub fn type_decodable_derive(mut s: synstructure::Structure<'_>) -> proc_macro2:
  decodable_body(s, decoder_ty)
 }
 
-pub fn meta_decodable_derive(mut s: synstructure::Structure<'_>) -> proc_macro2::TokenStream {
+pub(super) fn meta_decodable_derive(
+ mut s: synstructure::Structure<'_>,
+) -> proc_macro2::TokenStream {
  if !s.ast().generics.lifetimes().any(|lt| lt.lifetime.ident == "tcx") {
  s.add_impl_generic(parse_quote! { 'tcx });
  }
@@ -32,7 +36,7 @@ pub fn meta_decodable_derive(mut s: synstructure::Structure<'_>) -> proc_macro2:
  decodable_body(s, decoder_ty)
 }
 
-pub fn decodable_derive(mut s: synstructure::Structure<'_>) -> proc_macro2::TokenStream {
+pub(super) fn decodable_derive(mut s: synstructure::Structure<'_>) -> proc_macro2::TokenStream {
  let decoder_ty = quote! { __D };
  s.add_impl_generic(parse_quote! { #decoder_ty: ::rustc_span::SpanDecoder });
  s.add_bounds(synstructure::AddBounds::Generics);
@@ -41,7 +45,9 @@ pub fn decodable_derive(mut s: synstructure::Structure<'_>) -> proc_macro2::Toke
  decodable_body(s, decoder_ty)
 }
 
-pub fn decodable_generic_derive(mut s: synstructure::Structure<'_>) -> proc_macro2::TokenStream {
+pub(super) fn decodable_generic_derive(
+ mut s: synstructure::Structure<'_>,
+) -> proc_macro2::TokenStream {
  let decoder_ty = quote! { __D };
  s.add_impl_generic(parse_quote! { #decoder_ty: ::rustc_serialize::Decoder });
  s.add_bounds(synstructure::AddBounds::Generics);
@@ -123,7 +129,9 @@ fn decode_field(field: &syn::Field) -> proc_macro2::TokenStream {
  quote_spanned! { field_span=> #decode_inner_method(#__decoder) }
 }
 
-pub fn type_encodable_derive(mut s: synstructure::Structure<'_>) -> proc_macro2::TokenStream {
+pub(super) fn type_encodable_derive(
+ mut s: synstructure::Structure<'_>,
+) -> proc_macro2::TokenStream {
  let bound = if s.ast().generics.lifetimes().any(|lt| lt.lifetime.ident == "tcx") {
  quote! { <I = ::rustc_middle::ty::TyCtxt<'tcx>> }
  } else if s.ast().generics.type_params().any(|ty| ty.ident == "I") {
@@ -140,7 +148,9 @@ pub fn type_encodable_derive(mut s: synstructure::Structure<'_>) -> proc_macro2:
  encodable_body(s, encoder_ty, false)
 }
 
-pub fn meta_encodable_derive(mut s: synstructure::Structure<'_>) -> proc_macro2::TokenStream {
+pub(super) fn meta_encodable_derive(
+ mut s: synstructure::Structure<'_>,
+) -> proc_macro2::TokenStream {
  if !s.ast().generics.lifetimes().any(|lt| lt.lifetime.ident == "tcx") {
  s.add_impl_generic(parse_quote! { 'tcx });
  }
@@ -152,7 +162,7 @@ pub fn meta_encodable_derive(mut s: synstructure::Structure<'_>) -> proc_macro2:
  encodable_body(s, encoder_ty, true)
 }
 
-pub fn encodable_derive(mut s: synstructure::Structure<'_>) -> proc_macro2::TokenStream {
+pub(super) fn encodable_derive(mut s: synstructure::Structure<'_>) -> proc_macro2::TokenStream {
  let encoder_ty = quote! { __E };
  s.add_impl_generic(parse_quote! { #encoder_ty: ::rustc_span::SpanEncoder });
  s.add_bounds(synstructure::AddBounds::Generics);
@@ -161,7 +171,9 @@ pub fn encodable_derive(mut s: synstructure::Structure<'_>) -> proc_macro2::Toke
  encodable_body(s, encoder_ty, false)
 }
 
-pub fn encodable_generic_derive(mut s: synstructure::Structure<'_>) -> proc_macro2::TokenStream {
+pub(super) fn encodable_generic_derive(
+ mut s: synstructure::Structure<'_>,
+) -> proc_macro2::TokenStream {
  let encoder_ty = quote! { __E };
  s.add_impl_generic(parse_quote! { #encoder_ty: ::rustc_serialize::Encoder });
  s.add_bounds(synstructure::AddBounds::Generics);

compiler/rustc_macros/src/symbols.rs

@@ -131,7 +131,7 @@ impl Errors {
  }
 }
 
-pub fn symbols(input: TokenStream) -> TokenStream {
+pub(super) fn symbols(input: TokenStream) -> TokenStream {
  let (mut output, errors) = symbols_with_errors(input);
 
  // If we generated any errors, then report them as compiler_error!() macro calls.

compiler/rustc_macros/src/type_foldable.rs

@@ -1,7 +1,7 @@
 use quote::{quote, ToTokens};
 use syn::parse_quote;
 
-pub fn type_foldable_derive(mut s: synstructure::Structure<'_>) -> proc_macro2::TokenStream {
+pub(super) fn type_foldable_derive(mut s: synstructure::Structure<'_>) -> proc_macro2::TokenStream {
  if let syn::Data::Union(_) = s.ast().data {
  panic!("cannot derive on union")
  }

compiler/rustc_macros/src/type_visitable.rs

@@ -1,7 +1,9 @@
 use quote::quote;
 use syn::parse_quote;
 
-pub fn type_visitable_derive(mut s: synstructure::Structure<'_>) -> proc_macro2::TokenStream {
+pub(super) fn type_visitable_derive(
+ mut s: synstructure::Structure<'_>,
+) -> proc_macro2::TokenStream {
  if let syn::Data::Union(_) = s.ast().data {
  panic!("cannot derive on union")
  }

compiler/rustc_metadata/src/lib.rs

@@ -16,6 +16,7 @@
 #![feature(proc_macro_internals)]
 #![feature(rustdoc_internals)]
 #![feature(trusted_len)]
+#![warn(unreachable_pub)]
 // tidy-alphabetical-end
 
 extern crate proc_macro;

compiler/rustc_metadata/src/rmeta/decoder.rs

@@ -56,13 +56,13 @@ impl std::ops::Deref for MetadataBlob {
 
 impl MetadataBlob {
  /// Runs the [`MemDecoder`] validation and if it passes, constructs a new [`MetadataBlob`].
- pub fn new(slice: OwnedSlice) -> Result<Self, ()> {
+ pub(crate) fn new(slice: OwnedSlice) -> Result<Self, ()> {
  if MemDecoder::new(&slice, 0).is_ok() { Ok(Self(slice)) } else { Err(()) }
  }
 
  /// Since this has passed the validation of [`MetadataBlob::new`], this returns bytes which are
  /// known to pass the [`MemDecoder`] validation.
- pub fn bytes(&self) -> &OwnedSlice {
+ pub(crate) fn bytes(&self) -> &OwnedSlice {
  &self.0
  }
 }
@@ -332,12 +332,12 @@ impl<'a, 'tcx> DecodeContext<'a, 'tcx> {
  }
 
  #[inline]
- pub fn blob(&self) -> &'a MetadataBlob {
+ pub(crate) fn blob(&self) -> &'a MetadataBlob {
  self.blob
  }
 
  #[inline]
- pub fn cdata(&self) -> CrateMetadataRef<'a> {
+ fn cdata(&self) -> CrateMetadataRef<'a> {
  debug_assert!(self.cdata.is_some(), "missing CrateMetadata in DecodeContext");
  self.cdata.unwrap()
  }
@@ -377,7 +377,7 @@ impl<'a, 'tcx> DecodeContext<'a, 'tcx> {
  }
 
  #[inline]
- pub fn read_raw_bytes(&mut self, len: usize) -> &[u8] {
+ fn read_raw_bytes(&mut self, len: usize) -> &[u8] {
  self.opaque.read_raw_bytes(len)
  }
 }

compiler/rustc_metadata/src/rmeta/def_path_hash_map.rs

@@ -17,7 +17,7 @@ parameterized_over_tcx! {
 
 impl DefPathHashMapRef<'_> {
  #[inline]
- pub fn def_path_hash_to_def_index(&self, def_path_hash: &DefPathHash) -> DefIndex {
+ pub(crate) fn def_path_hash_to_def_index(&self, def_path_hash: &DefPathHash) -> DefIndex {
  match *self {
  DefPathHashMapRef::OwnedFromMetadata(ref map) => {
  map.get(&def_path_hash.local_hash()).unwrap()

compiler/rustc_metadata/src/rmeta/encoder.rs

@@ -2309,7 +2309,7 @@ fn encode_root_position(mut file: &File, pos: usize) -> Result<(), std::io::Erro
  Ok(())
 }
 
-pub fn provide(providers: &mut Providers) {
+pub(crate) fn provide(providers: &mut Providers) {
  *providers = Providers {
  doc_link_resolutions: |tcx, def_id| {
  tcx.resolutions(())

compiler/rustc_middle/src/dep_graph/dep_node.rs

@@ -61,8 +61,9 @@ use rustc_hir::def_id::{CrateNum, DefId, LocalDefId, LocalModDefId, ModDefId, LO
 use rustc_hir::definitions::DefPathHash;
 use rustc_hir::{HirId, ItemLocalId, OwnerId};
 pub use rustc_query_system::dep_graph::dep_node::DepKind;
+pub use rustc_query_system::dep_graph::DepNode;
 use rustc_query_system::dep_graph::FingerprintStyle;
-pub use rustc_query_system::dep_graph::{DepContext, DepNode, DepNodeParams};
+pub(crate) use rustc_query_system::dep_graph::{DepContext, DepNodeParams};
 use rustc_span::symbol::Symbol;
 
 use crate::mir::mono::MonoItem;
@@ -101,7 +102,7 @@ macro_rules! define_dep_nodes {
 
  // This checks that the discriminants of the variants have been assigned consecutively
  // from 0 so that they can be used as a dense index.
- pub const DEP_KIND_VARIANTS: u16 = {
+ pub(crate) const DEP_KIND_VARIANTS: u16 = {
  let deps = &[$(dep_kinds::$variant,)*];
  let mut i = 0;
  while i < deps.len() {

compiler/rustc_middle/src/lib.rs

@@ -62,6 +62,7 @@
 #![feature(try_blocks)]
 #![feature(type_alias_impl_trait)]
 #![feature(yeet_expr)]
+#![warn(unreachable_pub)]
 // tidy-alphabetical-end
 
 #[cfg(test)]

compiler/rustc_middle/src/mir/basic_blocks.rs

@@ -18,9 +18,9 @@ pub struct BasicBlocks<'tcx> {
 }
 
 // Typically 95%+ of basic blocks have 4 or fewer predecessors.
-pub type Predecessors = IndexVec<BasicBlock, SmallVec<[BasicBlock; 4]>>;
+type Predecessors = IndexVec<BasicBlock, SmallVec<[BasicBlock; 4]>>;
 
-pub type SwitchSources = FxHashMap<(BasicBlock, BasicBlock), SmallVec<[Option<u128>; 1]>>;
+type SwitchSources = FxHashMap<(BasicBlock, BasicBlock), SmallVec<[Option<u128>; 1]>>;
 
 #[derive(Clone, Default, Debug)]
 struct Cache {

compiler/rustc_middle/src/mir/generic_graph.rs

@@ -2,7 +2,7 @@ use gsgdt::{Edge, Graph, Node, NodeStyle};
 use rustc_middle::mir::*;
 
 /// Convert an MIR function into a gsgdt Graph
-pub fn mir_fn_to_generic_graph<'tcx>(tcx: TyCtxt<'tcx>, body: &Body<'_>) -> Graph {
+pub(crate) fn mir_fn_to_generic_graph<'tcx>(tcx: TyCtxt<'tcx>, body: &Body<'_>) -> Graph {
  let def_id = body.source.def_id();
  let def_name = graphviz_safe_def_name(def_id);
  let graph_name = format!("Mir_{def_name}");

compiler/rustc_middle/src/mir/interpret/allocation/init_mask.rs

@@ -243,7 +243,7 @@ impl hash::Hash for InitMaskMaterialized {
 }
 
 impl InitMaskMaterialized {
- pub const BLOCK_SIZE: u64 = 64;
+ const BLOCK_SIZE: u64 = 64;
 
  fn new(size: Size, state: bool) -> Self {
  let mut m = InitMaskMaterialized { blocks: vec![] };

compiler/rustc_middle/src/mir/mono.rs

@@ -396,7 +396,7 @@ impl<'tcx> CodegenUnit<'tcx> {
  // The codegen tests rely on items being process in the same order as
  // they appear in the file, so for local items, we sort by node_id first
  #[derive(PartialEq, Eq, PartialOrd, Ord)]
- pub struct ItemSortKey<'tcx>(Option<usize>, SymbolName<'tcx>);
+ struct ItemSortKey<'tcx>(Option<usize>, SymbolName<'tcx>);
 
  fn item_sort_key<'tcx>(tcx: TyCtxt<'tcx>, item: MonoItem<'tcx>) -> ItemSortKey<'tcx> {
  ItemSortKey(

compiler/rustc_middle/src/ty/context.rs

@@ -2190,7 +2190,7 @@ macro_rules! sty_debug_print {
  all_infer: usize,
  }
 
- pub fn go(fmt: &mut std::fmt::Formatter<'_>, tcx: TyCtxt<'_>) -> std::fmt::Result {
+ pub(crate) fn go(fmt: &mut std::fmt::Formatter<'_>, tcx: TyCtxt<'_>) -> std::fmt::Result {
  let mut total = DebugStat {
  total: 0,
  lt_infer: 0,

compiler/rustc_mir_build/src/check_unsafety.rs

@@ -1027,7 +1027,7 @@ impl UnsafeOpKind {
  }
 }
 
-pub fn check_unsafety(tcx: TyCtxt<'_>, def: LocalDefId) {
+pub(crate) fn check_unsafety(tcx: TyCtxt<'_>, def: LocalDefId) {
  // Closures and inline consts are handled by their owner, if it has a body
  // Also, don't safety check custom MIR
  if tcx.is_typeck_child(def.to_def_id()) || tcx.has_attr(def, sym::custom_mir) {

compiler/rustc_mir_build/src/lib.rs

@@ -8,6 +8,7 @@
 #![feature(if_let_guard)]
 #![feature(let_chains)]
 #![feature(try_blocks)]
+#![warn(unreachable_pub)]
 // tidy-alphabetical-end
 
 mod build;

compiler/rustc_mir_dataflow/src/framework/engine.rs

@@ -24,7 +24,7 @@ use crate::errors::{
 };
 use crate::framework::BitSetExt;
 
-pub type EntrySets<'tcx, A> = IndexVec<BasicBlock, <A as AnalysisDomain<'tcx>>::Domain>;
+type EntrySets<'tcx, A> = IndexVec<BasicBlock, <A as AnalysisDomain<'tcx>>::Domain>;
 
 /// A dataflow analysis that has converged to fixpoint.
 #[derive(Clone)]

compiler/rustc_mir_dataflow/src/framework/mod.rs

@@ -510,7 +510,7 @@ impl<T: Idx> GenKill<T> for lattice::Dual<BitSet<T>> {
 
 // NOTE: DO NOT CHANGE VARIANT ORDER. The derived `Ord` impls rely on the current order.
 #[derive(Clone, Copy, Debug, PartialEq, Eq, PartialOrd, Ord)]
-pub enum Effect {
+enum Effect {
  /// The "before" effect (e.g., `apply_before_statement_effect`) for a statement (or
  /// terminator).
  Before,
@@ -520,7 +520,7 @@ pub enum Effect {
 }
 
 impl Effect {
- pub const fn at_index(self, statement_index: usize) -> EffectIndex {
+ const fn at_index(self, statement_index: usize) -> EffectIndex {
  EffectIndex { effect: self, statement_index }
  }
 }

compiler/rustc_mir_dataflow/src/lib.rs

@@ -5,6 +5,7 @@
 #![feature(exact_size_is_empty)]
 #![feature(let_chains)]
 #![feature(try_blocks)]
+#![warn(unreachable_pub)]
 // tidy-alphabetical-end
 
 use rustc_middle::ty;

compiler/rustc_mir_dataflow/src/move_paths/abs_domain.rs

@@ -15,12 +15,12 @@ use rustc_middle::mir::{Local, Operand, PlaceElem, ProjectionElem};
 use rustc_middle::ty::Ty;
 
 #[derive(Copy, Clone, PartialEq, Eq, Hash, Debug)]
-pub struct AbstractOperand;
+pub(crate) struct AbstractOperand;
 #[derive(Copy, Clone, PartialEq, Eq, Hash, Debug)]
-pub struct AbstractType;
-pub type AbstractElem = ProjectionElem<AbstractOperand, AbstractType>;
+pub(crate) struct AbstractType;
+pub(crate) type AbstractElem = ProjectionElem<AbstractOperand, AbstractType>;
 
-pub trait Lift {
+pub(crate) trait Lift {
  type Abstract;
  fn lift(&self) -> Self::Abstract;
 }