diff options
| author | bors <bors@rust-lang.org> | 2021-08-01 19:04:37 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2021-08-01 19:04:37 +0000 |
| commit | 2827db2b137e899242e81f1beea39ae26e245153 (patch) | |
| tree | efa56d39851a4bf021de1868b5403842bc1e854a /library/std/src/sys | |
| parent | 4e21ef2a4eca12180e24a345d66066fc1e4e36da (diff) | |
| parent | 24f9de5a44478116bfabca5ebeca53981cc28146 (diff) | |
| download | rust-2827db2b137e899242e81f1beea39ae26e245153.tar.gz rust-2827db2b137e899242e81f1beea39ae26e245153.zip | |
Auto merge of #87622 - pietroalbini:bump-bootstrap, r=Mark-Simulacrum
Bump bootstrap compiler to 1.55 Changing the cfgs for stdarch is missing, but my understanding is that we don't need to do it as part of this PR? r? `@Mark-Simulacrum`
Diffstat (limited to 'library/std/src/sys')
| -rw-r--r-- | library/std/src/sys/unix/weak.rs | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/library/std/src/sys/unix/weak.rs b/library/std/src/sys/unix/weak.rs index cad8be6d289..ba432ec5494 100644 --- a/library/std/src/sys/unix/weak.rs +++ b/library/std/src/sys/unix/weak.rs @@ -26,8 +26,6 @@ use crate::marker; use crate::mem; use crate::sync::atomic::{self, AtomicUsize, Ordering}; -// Temporary null documentation to work around #57569 until the fix is beta -#[cfg_attr(bootstrap, doc = "")] pub(crate) macro weak { (fn $name:ident($($t:ty),*) -> $ret:ty) => ( #[allow(non_upper_case_globals)] @@ -103,8 +101,6 @@ unsafe fn fetch(name: &str) -> usize { libc::dlsym(libc::RTLD_DEFAULT, name.as_ptr()) as usize } -// Temporary null documentation to work around #57569 until the fix is beta -#[cfg_attr(bootstrap, doc = "")] #[cfg(not(any(target_os = "linux", target_os = "android")))] pub(crate) macro syscall { (fn $name:ident($($arg_name:ident: $t:ty),*) -> $ret:ty) => ( @@ -123,7 +119,6 @@ pub(crate) macro syscall { ) } -#[cfg_attr(bootstrap, doc = "")] #[cfg(any(target_os = "linux", target_os = "android"))] pub(crate) macro syscall { (fn $name:ident($($arg_name:ident: $t:ty),*) -> $ret:ty) => ( |
