Skip to content

Commit

Permalink
Unrolled build for rust-lang#137214
Browse files Browse the repository at this point in the history
Rollup merge of rust-lang#137214 - cyrgani:clippy_diagnostic_items, r=compiler-errors

add last std diagnostic items for clippy

Part of rust-lang/rust-clippy#5393.
Add diagnostic item attributes to the items in `std` and `core` where clippy currently uses hardcoded paths (https://github.com/rust-lang/rust-clippy/blob/master/clippy_utils/src/paths.rs).
  • Loading branch information
rust-timer authored Feb 18, 2025
2 parents 3b022d8 + a72402a commit 166c28b
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 0 deletions.
7 changes: 7 additions & 0 deletions compiler/rustc_span/src/symbol.rs
Original file line number Diff line number Diff line change
Expand Up @@ -192,6 +192,7 @@ symbols! {
Capture,
Cell,
Center,
Child,
Cleanup,
Clone,
CoercePointee,
Expand Down Expand Up @@ -336,6 +337,7 @@ symbols! {
SliceIter,
Some,
SpanCtxt,
Stdin,
String,
StructuralPartialEq,
SubdiagMessage,
Expand Down Expand Up @@ -599,6 +601,9 @@ symbols! {
cfi,
cfi_encoding,
char,
char_is_ascii,
child_id,
child_kill,
client,
clippy,
clobber_abi,
Expand Down Expand Up @@ -1468,6 +1473,7 @@ symbols! {
panic_2015,
panic_2021,
panic_abort,
panic_any,
panic_bounds_check,
panic_cannot_unwind,
panic_const_add_overflow,
Expand Down Expand Up @@ -1573,6 +1579,7 @@ symbols! {
proc_macro_mod,
proc_macro_non_items,
proc_macro_path_invoc,
process_abort,
process_exit,
profiler_builtins,
profiler_runtime,
Expand Down
1 change: 1 addition & 0 deletions library/core/src/char/methods.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1168,6 +1168,7 @@ impl char {
#[must_use]
#[stable(feature = "ascii_methods_on_intrinsics", since = "1.23.0")]
#[rustc_const_stable(feature = "const_char_is_ascii", since = "1.32.0")]
#[cfg_attr(not(test), rustc_diagnostic_item = "char_is_ascii")]
#[inline]
pub const fn is_ascii(&self) -> bool {
*self as u32 <= 0x7F
Expand Down
1 change: 1 addition & 0 deletions library/std/src/io/stdio.rs
Original file line number Diff line number Diff line change
Expand Up @@ -239,6 +239,7 @@ fn handle_ebadf_lazy<T>(r: io::Result<T>, default: impl FnOnce() -> T) -> io::Re
/// }
/// ```
#[stable(feature = "rust1", since = "1.0.0")]
#[cfg_attr(not(test), rustc_diagnostic_item = "Stdin")]
pub struct Stdin {
inner: &'static Mutex<BufReader<StdinRaw>>,
}
Expand Down
1 change: 1 addition & 0 deletions library/std/src/panic.rs
Original file line number Diff line number Diff line change
Expand Up @@ -255,6 +255,7 @@ pub use crate::panicking::{set_hook, take_hook};
#[stable(feature = "panic_any", since = "1.51.0")]
#[inline]
#[track_caller]
#[cfg_attr(not(test), rustc_diagnostic_item = "panic_any")]
pub fn panic_any<M: 'static + Any + Send>(msg: M) -> ! {
crate::panicking::begin_panic(msg);
}
Expand Down
4 changes: 4 additions & 0 deletions library/std/src/process.rs
Original file line number Diff line number Diff line change
Expand Up @@ -217,6 +217,7 @@ use crate::{fmt, fs, str};
///
/// [`wait`]: Child::wait
#[stable(feature = "process", since = "1.0.0")]
#[cfg_attr(not(test), rustc_diagnostic_item = "Child")]
pub struct Child {
pub(crate) handle: imp::Process,

Expand Down Expand Up @@ -2115,6 +2116,7 @@ impl Child {
/// [`ErrorKind`]: io::ErrorKind
/// [`InvalidInput`]: io::ErrorKind::InvalidInput
#[stable(feature = "process", since = "1.0.0")]
#[cfg_attr(not(test), rustc_diagnostic_item = "child_kill")]
pub fn kill(&mut self) -> io::Result<()> {
self.handle.kill()
}
Expand All @@ -2135,6 +2137,7 @@ impl Child {
/// ```
#[must_use]
#[stable(feature = "process_id", since = "1.3.0")]
#[cfg_attr(not(test), rustc_diagnostic_item = "child_id")]
pub fn id(&self) -> u32 {
self.handle.id()
}
Expand Down Expand Up @@ -2375,6 +2378,7 @@ pub fn exit(code: i32) -> ! {
/// [panic hook]: crate::panic::set_hook
#[stable(feature = "process_abort", since = "1.17.0")]
#[cold]
#[cfg_attr(not(test), rustc_diagnostic_item = "process_abort")]
pub fn abort() -> ! {
crate::sys::abort_internal();
}
Expand Down

0 comments on commit 166c28b

Please sign in to comment.