Skip to content

Commit fdd88cc

Browse files
borsbors
committed
Auto merge of rust-lang#104428 - matthiaskrgr:rollup-jo3078i, r=matthiaskrgr
Rollup of 13 pull requests Successful merges: - rust-lang#103842 (Adding Fuchsia compiler testing script, docs) - rust-lang#104354 (Remove leading newlines from `NonZero*` doc examples) - rust-lang#104372 (Update compiler-builtins) - rust-lang#104380 (rustdoc: remove unused CSS `code { opacity: 1 }`) - rust-lang#104381 (Remove dead NoneError diagnostic handling) - rust-lang#104383 (Remove unused symbols and diagnostic items) - rust-lang#104391 (Deriving cleanups) - rust-lang#104403 (Specify language of code comment to generate document) - rust-lang#104404 (Fix missing minification for static files) - rust-lang#104413 ([llvm-wrapper] adapt for LLVM API change) - rust-lang#104415 (rustdoc: fix corner case in search keyboard commands) - rust-lang#104422 (Fix suggest associated call syntax) - rust-lang#104426 (Add test for rust-lang#102154) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
2 parents 3c9efab + 0e209ce commit fdd88cc

File tree

7 files changed

+7
-43
lines changed

7 files changed

+7
-43
lines changed

‎core/src/fmt/mod.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1054,7 +1054,6 @@ pub trait UpperHex {
10541054
pub trait Pointer {
10551055
/// Formats the value using the given formatter.
10561056
#[stable(feature = "rust1", since = "1.0.0")]
1057-
#[rustc_diagnostic_item = "pointer_trait_fmt"]
10581057
fn fmt(&self, f: &mut Formatter<'_>) -> Result;
10591058
}
10601059

‎core/src/macros/mod.rs

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -338,7 +338,6 @@ pub macro debug_assert_matches($($arg:tt)*) {
338338
/// ```
339339
#[macro_export]
340340
#[stable(feature = "matches_macro", since = "1.42.0")]
341-
#[cfg_attr(not(test), rustc_diagnostic_item = "matches_macro")]
342341
macro_rules! matches {
343342
($expression:expr, $(|)? $( $pattern:pat_param )|+ $( if $guard: expr )? $(,)?) => {
344343
match $expression {
@@ -820,7 +819,6 @@ pub(crate) mod builtin {
820819
#[stable(feature = "compile_error_macro", since = "1.20.0")]
821820
#[rustc_builtin_macro]
822821
#[macro_export]
823-
#[cfg_attr(not(test), rustc_diagnostic_item = "compile_error_macro")]
824822
macro_rules! compile_error {
825823
($msg:expr $(,)?) => {{ /* compiler built-in */ }};
826824
}
@@ -944,7 +942,6 @@ pub(crate) mod builtin {
944942
#[stable(feature = "rust1", since = "1.0.0")]
945943
#[rustc_builtin_macro]
946944
#[macro_export]
947-
#[cfg_attr(not(test), rustc_diagnostic_item = "env_macro")]
948945
macro_rules! env {
949946
($name:expr $(,)?) => {{ /* compiler built-in */ }};
950947
($name:expr, $error_msg:expr $(,)?) => {{ /* compiler built-in */ }};
@@ -973,7 +970,6 @@ pub(crate) mod builtin {
973970
#[stable(feature = "rust1", since = "1.0.0")]
974971
#[rustc_builtin_macro]
975972
#[macro_export]
976-
#[cfg_attr(not(test), rustc_diagnostic_item = "option_env_macro")]
977973
macro_rules! option_env {
978974
($name:expr $(,)?) => {{ /* compiler built-in */ }};
979975
}
@@ -1058,7 +1054,6 @@ pub(crate) mod builtin {
10581054
#[stable(feature = "rust1", since = "1.0.0")]
10591055
#[rustc_builtin_macro]
10601056
#[macro_export]
1061-
#[cfg_attr(not(test), rustc_diagnostic_item = "concat_macro")]
10621057
macro_rules! concat {
10631058
($($e:expr),* $(,)?) => {{ /* compiler built-in */ }};
10641059
}
@@ -1084,7 +1079,6 @@ pub(crate) mod builtin {
10841079
#[stable(feature = "rust1", since = "1.0.0")]
10851080
#[rustc_builtin_macro]
10861081
#[macro_export]
1087-
#[cfg_attr(not(test), rustc_diagnostic_item = "line_macro")]
10881082
macro_rules! line {
10891083
() => {
10901084
/* compiler built-in */
@@ -1124,7 +1118,6 @@ pub(crate) mod builtin {
11241118
#[stable(feature = "rust1", since = "1.0.0")]
11251119
#[rustc_builtin_macro]
11261120
#[macro_export]
1127-
#[cfg_attr(not(test), rustc_diagnostic_item = "column_macro")]
11281121
macro_rules! column {
11291122
() => {
11301123
/* compiler built-in */
@@ -1150,7 +1143,6 @@ pub(crate) mod builtin {
11501143
#[stable(feature = "rust1", since = "1.0.0")]
11511144
#[rustc_builtin_macro]
11521145
#[macro_export]
1153-
#[cfg_attr(not(test), rustc_diagnostic_item = "file_macro")]
11541146
macro_rules! file {
11551147
() => {
11561148
/* compiler built-in */
@@ -1175,7 +1167,6 @@ pub(crate) mod builtin {
11751167
#[stable(feature = "rust1", since = "1.0.0")]
11761168
#[rustc_builtin_macro]
11771169
#[macro_export]
1178-
#[cfg_attr(not(test), rustc_diagnostic_item = "stringify_macro")]
11791170
macro_rules! stringify {
11801171
($($t:tt)*) => {
11811172
/* compiler built-in */
@@ -1282,7 +1273,6 @@ pub(crate) mod builtin {
12821273
#[stable(feature = "rust1", since = "1.0.0")]
12831274
#[rustc_builtin_macro]
12841275
#[macro_export]
1285-
#[cfg_attr(not(test), rustc_diagnostic_item = "module_path_macro")]
12861276
macro_rules! module_path {
12871277
() => {
12881278
/* compiler built-in */
@@ -1316,7 +1306,6 @@ pub(crate) mod builtin {
13161306
#[stable(feature = "rust1", since = "1.0.0")]
13171307
#[rustc_builtin_macro]
13181308
#[macro_export]
1319-
#[cfg_attr(not(test), rustc_diagnostic_item = "cfg_macro")]
13201309
macro_rules! cfg {
13211310
($($cfg:tt)*) => {
13221311
/* compiler built-in */
@@ -1367,7 +1356,6 @@ pub(crate) mod builtin {
13671356
#[stable(feature = "rust1", since = "1.0.0")]
13681357
#[rustc_builtin_macro]
13691358
#[macro_export]
1370-
#[cfg_attr(not(test), rustc_diagnostic_item = "include_macro")]
13711359
macro_rules! include {
13721360
($file:expr $(,)?) => {{ /* compiler built-in */ }};
13731361
}

‎core/src/num/nonzero.rs

Lines changed: 6 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -321,7 +321,6 @@ macro_rules! nonzero_unsigned_operations {
321321
///
322322
/// ```
323323
#[doc = concat!("# use std::num::", stringify!($Ty), ";")]
324-
///
325324
/// # fn main() { test().unwrap(); }
326325
/// # fn test() -> Option<()> {
327326
#[doc = concat!("let one = ", stringify!($Ty), "::new(1)?;")]
@@ -356,7 +355,6 @@ macro_rules! nonzero_unsigned_operations {
356355
///
357356
/// ```
358357
#[doc = concat!("# use std::num::", stringify!($Ty), ";")]
359-
///
360358
/// # fn main() { test().unwrap(); }
361359
/// # fn test() -> Option<()> {
362360
#[doc = concat!("let one = ", stringify!($Ty), "::new(1)?;")]
@@ -391,8 +389,8 @@ macro_rules! nonzero_unsigned_operations {
391389
///
392390
/// ```
393391
/// #![feature(nonzero_ops)]
394-
#[doc = concat!("# use std::num::", stringify!($Ty), ";")]
395392
///
393+
#[doc = concat!("# use std::num::", stringify!($Ty), ";")]
396394
/// # fn main() { test().unwrap(); }
397395
/// # fn test() -> Option<()> {
398396
#[doc = concat!("let one = ", stringify!($Ty), "::new(1)?;")]
@@ -420,7 +418,6 @@ macro_rules! nonzero_unsigned_operations {
420418
///
421419
/// ```
422420
#[doc = concat!("# use std::num::", stringify!($Ty), ";")]
423-
///
424421
/// # fn main() { test().unwrap(); }
425422
/// # fn test() -> Option<()> {
426423
#[doc = concat!("let two = ", stringify!($Ty), "::new(2)?;")]
@@ -461,7 +458,6 @@ macro_rules! nonzero_unsigned_operations {
461458
///
462459
/// ```
463460
#[doc = concat!("# use std::num::", stringify!($Ty), ";")]
464-
///
465461
#[doc = concat!("assert_eq!(", stringify!($Ty), "::new(7).unwrap().ilog2(), 2);")]
466462
#[doc = concat!("assert_eq!(", stringify!($Ty), "::new(8).unwrap().ilog2(), 3);")]
467463
#[doc = concat!("assert_eq!(", stringify!($Ty), "::new(9).unwrap().ilog2(), 3);")]
@@ -486,7 +482,6 @@ macro_rules! nonzero_unsigned_operations {
486482
///
487483
/// ```
488484
#[doc = concat!("# use std::num::", stringify!($Ty), ";")]
489-
///
490485
#[doc = concat!("assert_eq!(", stringify!($Ty), "::new(99).unwrap().ilog10(), 1);")]
491486
#[doc = concat!("assert_eq!(", stringify!($Ty), "::new(100).unwrap().ilog10(), 2);")]
492487
#[doc = concat!("assert_eq!(", stringify!($Ty), "::new(101).unwrap().ilog10(), 2);")]
@@ -526,7 +521,6 @@ macro_rules! nonzero_signed_operations {
526521
///
527522
/// ```
528523
#[doc = concat!("# use std::num::", stringify!($Ty), ";")]
529-
///
530524
/// # fn main() { test().unwrap(); }
531525
/// # fn test() -> Option<()> {
532526
#[doc = concat!("let pos = ", stringify!($Ty), "::new(1)?;")]
@@ -556,7 +550,6 @@ macro_rules! nonzero_signed_operations {
556550
///
557551
/// ```
558552
#[doc = concat!("# use std::num::", stringify!($Ty), ";")]
559-
///
560553
/// # fn main() { test().unwrap(); }
561554
/// # fn test() -> Option<()> {
562555
#[doc = concat!("let pos = ", stringify!($Ty), "::new(1)?;")]
@@ -591,7 +584,6 @@ macro_rules! nonzero_signed_operations {
591584
///
592585
/// ```
593586
#[doc = concat!("# use std::num::", stringify!($Ty), ";")]
594-
///
595587
/// # fn main() { test().unwrap(); }
596588
/// # fn test() -> Option<()> {
597589
#[doc = concat!("let pos = ", stringify!($Ty), "::new(1)?;")]
@@ -626,7 +618,6 @@ macro_rules! nonzero_signed_operations {
626618
///
627619
/// ```
628620
#[doc = concat!("# use std::num::", stringify!($Ty), ";")]
629-
///
630621
/// # fn main() { test().unwrap(); }
631622
/// # fn test() -> Option<()> {
632623
#[doc = concat!("let pos = ", stringify!($Ty), "::new(1)?;")]
@@ -662,7 +653,6 @@ macro_rules! nonzero_signed_operations {
662653
///
663654
/// ```
664655
#[doc = concat!("# use std::num::", stringify!($Ty), ";")]
665-
///
666656
/// # fn main() { test().unwrap(); }
667657
/// # fn test() -> Option<()> {
668658
#[doc = concat!("let pos = ", stringify!($Ty), "::new(1)?;")]
@@ -905,7 +895,6 @@ macro_rules! nonzero_unsigned_signed_operations {
905895
///
906896
/// ```
907897
#[doc = concat!("# use std::num::", stringify!($Ty), ";")]
908-
///
909898
/// # fn main() { test().unwrap(); }
910899
/// # fn test() -> Option<()> {
911900
#[doc = concat!("let two = ", stringify!($Ty), "::new(2)?;")]
@@ -941,7 +930,6 @@ macro_rules! nonzero_unsigned_signed_operations {
941930
///
942931
/// ```
943932
#[doc = concat!("# use std::num::", stringify!($Ty), ";")]
944-
///
945933
/// # fn main() { test().unwrap(); }
946934
/// # fn test() -> Option<()> {
947935
#[doc = concat!("let two = ", stringify!($Ty), "::new(2)?;")]
@@ -986,8 +974,8 @@ macro_rules! nonzero_unsigned_signed_operations {
986974
///
987975
/// ```
988976
/// #![feature(nonzero_ops)]
989-
#[doc = concat!("# use std::num::", stringify!($Ty), ";")]
990977
///
978+
#[doc = concat!("# use std::num::", stringify!($Ty), ";")]
991979
/// # fn main() { test().unwrap(); }
992980
/// # fn test() -> Option<()> {
993981
#[doc = concat!("let two = ", stringify!($Ty), "::new(2)?;")]
@@ -1014,7 +1002,6 @@ macro_rules! nonzero_unsigned_signed_operations {
10141002
///
10151003
/// ```
10161004
#[doc = concat!("# use std::num::", stringify!($Ty), ";")]
1017-
///
10181005
/// # fn main() { test().unwrap(); }
10191006
/// # fn test() -> Option<()> {
10201007
#[doc = concat!("let three = ", stringify!($Ty), "::new(3)?;")]
@@ -1058,7 +1045,6 @@ macro_rules! nonzero_unsigned_signed_operations {
10581045
///
10591046
/// ```
10601047
#[doc = concat!("# use std::num::", stringify!($Ty), ";")]
1061-
///
10621048
/// # fn main() { test().unwrap(); }
10631049
/// # fn test() -> Option<()> {
10641050
#[doc = concat!("let three = ", stringify!($Ty), "::new(3)?;")]
@@ -1162,8 +1148,8 @@ macro_rules! nonzero_min_max_unsigned {
11621148
///
11631149
/// ```
11641150
/// #![feature(nonzero_min_max)]
1165-
#[doc = concat!("# use std::num::", stringify!($Ty), ";")]
11661151
///
1152+
#[doc = concat!("# use std::num::", stringify!($Ty), ";")]
11671153
#[doc = concat!("assert_eq!(", stringify!($Ty), "::MIN.get(), 1", stringify!($Int), ");")]
11681154
/// ```
11691155
#[unstable(feature = "nonzero_min_max", issue = "89065")]
@@ -1177,8 +1163,8 @@ macro_rules! nonzero_min_max_unsigned {
11771163
///
11781164
/// ```
11791165
/// #![feature(nonzero_min_max)]
1180-
#[doc = concat!("# use std::num::", stringify!($Ty), ";")]
11811166
///
1167+
#[doc = concat!("# use std::num::", stringify!($Ty), ";")]
11821168
#[doc = concat!("assert_eq!(", stringify!($Ty), "::MAX.get(), ", stringify!($Int), "::MAX);")]
11831169
/// ```
11841170
#[unstable(feature = "nonzero_min_max", issue = "89065")]
@@ -1204,8 +1190,8 @@ macro_rules! nonzero_min_max_signed {
12041190
///
12051191
/// ```
12061192
/// #![feature(nonzero_min_max)]
1207-
#[doc = concat!("# use std::num::", stringify!($Ty), ";")]
12081193
///
1194+
#[doc = concat!("# use std::num::", stringify!($Ty), ";")]
12091195
#[doc = concat!("assert_eq!(", stringify!($Ty), "::MIN.get(), ", stringify!($Int), "::MIN);")]
12101196
/// ```
12111197
#[unstable(feature = "nonzero_min_max", issue = "89065")]
@@ -1223,8 +1209,8 @@ macro_rules! nonzero_min_max_signed {
12231209
///
12241210
/// ```
12251211
/// #![feature(nonzero_min_max)]
1226-
#[doc = concat!("# use std::num::", stringify!($Ty), ";")]
12271212
///
1213+
#[doc = concat!("# use std::num::", stringify!($Ty), ";")]
12281214
#[doc = concat!("assert_eq!(", stringify!($Ty), "::MAX.get(), ", stringify!($Int), "::MAX);")]
12291215
/// ```
12301216
#[unstable(feature = "nonzero_min_max", issue = "89065")]

‎core/src/ops/function.rs

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,6 @@ use crate::marker::Tuple;
5757
#[cfg(bootstrap)]
5858
#[lang = "fn"]
5959
#[stable(feature = "rust1", since = "1.0.0")]
60-
#[rustc_diagnostic_item = "Fn"]
6160
#[rustc_paren_sugar]
6261
#[rustc_on_unimplemented(
6362
on(
@@ -138,7 +137,6 @@ pub trait Fn<Args>: FnMut<Args> {
138137
#[cfg(not(bootstrap))]
139138
#[lang = "fn"]
140139
#[stable(feature = "rust1", since = "1.0.0")]
141-
#[rustc_diagnostic_item = "Fn"]
142140
#[rustc_paren_sugar]
143141
#[rustc_on_unimplemented(
144142
on(
@@ -227,7 +225,6 @@ pub trait Fn<Args: Tuple>: FnMut<Args> {
227225
#[cfg(bootstrap)]
228226
#[lang = "fn_mut"]
229227
#[stable(feature = "rust1", since = "1.0.0")]
230-
#[rustc_diagnostic_item = "FnMut"]
231228
#[rustc_paren_sugar]
232229
#[rustc_on_unimplemented(
233230
on(
@@ -316,7 +313,6 @@ pub trait FnMut<Args>: FnOnce<Args> {
316313
#[cfg(not(bootstrap))]
317314
#[lang = "fn_mut"]
318315
#[stable(feature = "rust1", since = "1.0.0")]
319-
#[rustc_diagnostic_item = "FnMut"]
320316
#[rustc_paren_sugar]
321317
#[rustc_on_unimplemented(
322318
on(
@@ -397,7 +393,6 @@ pub trait FnMut<Args: Tuple>: FnOnce<Args> {
397393
#[cfg(bootstrap)]
398394
#[lang = "fn_once"]
399395
#[stable(feature = "rust1", since = "1.0.0")]
400-
#[rustc_diagnostic_item = "FnOnce"]
401396
#[rustc_paren_sugar]
402397
#[rustc_on_unimplemented(
403398
on(
@@ -483,7 +478,6 @@ pub trait FnOnce<Args> {
483478
#[cfg(not(bootstrap))]
484479
#[lang = "fn_once"]
485480
#[stable(feature = "rust1", since = "1.0.0")]
486-
#[rustc_diagnostic_item = "FnOnce"]
487481
#[rustc_paren_sugar]
488482
#[rustc_on_unimplemented(
489483
on(

‎core/src/panic.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,6 @@ pub macro unreachable_2015 {
8080
#[doc(hidden)]
8181
#[unstable(feature = "edition_panic", issue = "none", reason = "use unreachable!() instead")]
8282
#[allow_internal_unstable(core_panic)]
83-
#[rustc_diagnostic_item = "unreachable_2021_macro"]
8483
#[rustc_macro_transparency = "semitransparent"]
8584
pub macro unreachable_2021 {
8685
() => (

‎std/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ panic_unwind = { path = "../panic_unwind", optional = true }
1616
panic_abort = { path = "../panic_abort" }
1717
core = { path = "../core" }
1818
libc = { version = "0.2.135", default-features = false, features = ['rustc-dep-of-std'] }
19-
compiler_builtins = { version = "0.1.73" }
19+
compiler_builtins = { version = "0.1.82" }
2020
profiler_builtins = { path = "../profiler_builtins", optional = true }
2121
unwind = { path = "../unwind" }
2222
hashbrown = { version = "0.12", default-features = false, features = ['rustc-dep-of-std'] }

‎std/src/net/ip_addr.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,6 @@ pub enum IpAddr {
7373
/// assert!("0xcb.0x0.0x71.0x00".parse::<Ipv4Addr>().is_err()); // all octets are in hex
7474
/// ```
7575
#[derive(Copy, Clone, PartialEq, Eq, Hash)]
76-
#[cfg_attr(not(test), rustc_diagnostic_item = "Ipv4Addr")]
7776
#[stable(feature = "rust1", since = "1.0.0")]
7877
pub struct Ipv4Addr {
7978
octets: [u8; 4],
@@ -156,7 +155,6 @@ pub struct Ipv4Addr {
156155
/// assert_eq!(localhost.is_loopback(), true);
157156
/// ```
158157
#[derive(Copy, Clone, PartialEq, Eq, Hash)]
159-
#[cfg_attr(not(test), rustc_diagnostic_item = "Ipv6Addr")]
160158
#[stable(feature = "rust1", since = "1.0.0")]
161159
pub struct Ipv6Addr {
162160
octets: [u8; 16],

0 commit comments

Comments
 (0)