Skip to content

Commit

Permalink
Rollup merge of rust-lang#126013 - nnethercote:unreachable_pub, r=Urgau
Browse files Browse the repository at this point in the history
Add `#[warn(unreachable_pub)]` to a bunch of compiler crates

By default `unreachable_pub` identifies things that need not be `pub` and tells you to make them `pub(crate)`. But sometimes those things don't need any kind of visibility. So they way I did these was to remove the visibility entirely for each thing the lint identifies, and then add `pub(crate)` back in everywhere the compiler said it was necessary. (Or occasionally `pub(super)` when context suggested that was appropriate.) Tedious, but results in more `pub` removal.

There are plenty more crates to do but this seems like enough for a first PR.

r? `@compiler-errors`
  • Loading branch information
matthiaskrgr authored Aug 26, 2024
2 parents 22572d0 + cc84442 commit 478987e
Show file tree
Hide file tree
Showing 76 changed files with 503 additions and 464 deletions.
1 change: 1 addition & 0 deletions compiler/rustc_abi/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
#![cfg_attr(feature = "nightly", doc(rust_logo))]
#![cfg_attr(feature = "nightly", feature(rustdoc_internals))]
#![cfg_attr(feature = "nightly", feature(step_trait))]
#![warn(unreachable_pub)]
// tidy-alphabetical-end

use std::fmt;
Expand Down
1 change: 1 addition & 0 deletions compiler/rustc_arena/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
#![feature(rustc_attrs)]
#![feature(rustdoc_internals)]
#![feature(strict_provenance)]
#![warn(unreachable_pub)]
// tidy-alphabetical-end

use std::alloc::Layout;
Expand Down
22 changes: 11 additions & 11 deletions compiler/rustc_arena/src/tests.rs
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ impl<T> TypedArena<T> {
}

#[test]
pub fn test_unused() {
fn test_unused() {
let arena: TypedArena<Point> = TypedArena::default();
assert!(arena.chunks.borrow().is_empty());
}
Expand Down Expand Up @@ -75,7 +75,7 @@ fn test_arena_alloc_nested() {
}

#[test]
pub fn test_copy() {
fn test_copy() {
let arena = TypedArena::default();
#[cfg(not(miri))]
const N: usize = 100000;
Expand All @@ -87,13 +87,13 @@ pub fn test_copy() {
}

#[bench]
pub fn bench_copy(b: &mut Bencher) {
fn bench_copy(b: &mut Bencher) {
let arena = TypedArena::default();
b.iter(|| arena.alloc(Point { x: 1, y: 2, z: 3 }))
}

#[bench]
pub fn bench_copy_nonarena(b: &mut Bencher) {
fn bench_copy_nonarena(b: &mut Bencher) {
b.iter(|| {
let _: Box<_> = Box::new(Point { x: 1, y: 2, z: 3 });
})
Expand All @@ -106,7 +106,7 @@ struct Noncopy {
}

#[test]
pub fn test_noncopy() {
fn test_noncopy() {
let arena = TypedArena::default();
#[cfg(not(miri))]
const N: usize = 100000;
Expand All @@ -118,7 +118,7 @@ pub fn test_noncopy() {
}

#[test]
pub fn test_typed_arena_zero_sized() {
fn test_typed_arena_zero_sized() {
let arena = TypedArena::default();
#[cfg(not(miri))]
const N: usize = 100000;
Expand All @@ -130,7 +130,7 @@ pub fn test_typed_arena_zero_sized() {
}

#[test]
pub fn test_typed_arena_clear() {
fn test_typed_arena_clear() {
let mut arena = TypedArena::default();
for _ in 0..10 {
arena.clear();
Expand All @@ -145,7 +145,7 @@ pub fn test_typed_arena_clear() {
}

#[bench]
pub fn bench_typed_arena_clear(b: &mut Bencher) {
fn bench_typed_arena_clear(b: &mut Bencher) {
let mut arena = TypedArena::default();
b.iter(|| {
arena.alloc(Point { x: 1, y: 2, z: 3 });
Expand All @@ -154,7 +154,7 @@ pub fn bench_typed_arena_clear(b: &mut Bencher) {
}

#[bench]
pub fn bench_typed_arena_clear_100(b: &mut Bencher) {
fn bench_typed_arena_clear_100(b: &mut Bencher) {
let mut arena = TypedArena::default();
b.iter(|| {
for _ in 0..100 {
Expand Down Expand Up @@ -230,15 +230,15 @@ fn test_typed_arena_drop_small_count() {
}

#[bench]
pub fn bench_noncopy(b: &mut Bencher) {
fn bench_noncopy(b: &mut Bencher) {
let arena = TypedArena::default();
b.iter(|| {
arena.alloc(Noncopy { string: "hello world".to_string(), array: vec![1, 2, 3, 4, 5] })
})
}

#[bench]
pub fn bench_noncopy_nonarena(b: &mut Bencher) {
fn bench_noncopy_nonarena(b: &mut Bencher) {
b.iter(|| {
let _: Box<_> =
Box::new(Noncopy { string: "hello world".to_string(), array: vec![1, 2, 3, 4, 5] });
Expand Down
1 change: 1 addition & 0 deletions compiler/rustc_ast/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
#![feature(never_type)]
#![feature(rustdoc_internals)]
#![feature(stmt_expr_attributes)]
#![warn(unreachable_pub)]
// tidy-alphabetical-end

pub mod util {
Expand Down
1 change: 1 addition & 0 deletions compiler/rustc_ast_ir/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
#![cfg_attr(feature = "nightly", allow(internal_features))]
#![cfg_attr(feature = "nightly", feature(never_type))]
#![cfg_attr(feature = "nightly", feature(rustc_attrs))]
#![warn(unreachable_pub)]
// tidy-alphabetical-end

#[cfg(feature = "nightly")]
Expand Down
Loading

0 comments on commit 478987e

Please sign in to comment.