diff options
| author | Lukas Markeffsky <@> | 2022-12-26 22:01:53 +0100 |
|---|---|---|
| committer | Mark Rousskov <mark.simulacrum@gmail.com> | 2022-12-28 09:18:43 -0500 |
| commit | fdf6cc34b2564100c5d07b573ef246124ee45b47 (patch) | |
| tree | c8dba4e6ad1885186c89c184d23a453a1c29341e /library/std/src | |
| parent | 11191279b721b326d545005b96ad9eecc7a95827 (diff) | |
| download | rust-fdf6cc34b2564100c5d07b573ef246124ee45b47.tar.gz rust-fdf6cc34b2564100c5d07b573ef246124ee45b47.zip | |
delete more `cfg(bootstrap)`
Diffstat (limited to 'library/std/src')
| -rw-r--r-- | library/std/src/process.rs | 17 | ||||
| -rw-r--r-- | library/std/src/sys/unix/mod.rs | 7 |
2 files changed, 6 insertions, 18 deletions
diff --git a/library/std/src/process.rs b/library/std/src/process.rs index c1da395bfc5..62ce2cb33dc 100644 --- a/library/std/src/process.rs +++ b/library/std/src/process.rs @@ -2164,18 +2164,11 @@ pub fn id() -> u32 { /// to provide similar functionality. #[cfg_attr(not(test), lang = "termination")] #[stable(feature = "termination_trait_lib", since = "1.61.0")] -#[rustc_on_unimplemented( - on( - all(not(bootstrap), cause = "MainFunctionType"), - message = "`main` has invalid return type `{Self}`", - label = "`main` can only return types that implement `{Termination}`" - ), - on( - bootstrap, - message = "`main` has invalid return type `{Self}`", - label = "`main` can only return types that implement `{Termination}`" - ) -)] +#[rustc_on_unimplemented(on( + cause = "MainFunctionType", + message = "`main` has invalid return type `{Self}`", + label = "`main` can only return types that implement `{Termination}`" +))] pub trait Termination { /// Is called to get the representation of the value as status code. /// This status code is returned to the operating system. diff --git a/library/std/src/sys/unix/mod.rs b/library/std/src/sys/unix/mod.rs index 83a43b6ee26..233e4a26bdc 100644 --- a/library/std/src/sys/unix/mod.rs +++ b/library/std/src/sys/unix/mod.rs @@ -184,12 +184,7 @@ pub unsafe fn init(argc: isize, argv: *const *const u8, sigpipe: u8) { sigpipe::SIG_DFL => (true, Some(libc::SIG_DFL)), _ => unreachable!(), }; - // The bootstrap compiler doesn't know about sigpipe::DEFAULT, and always passes in - // SIG_IGN. This causes some tests to fail because they expect SIGPIPE to be reset to - // default on process spawning (which doesn't happen if #[unix_sigpipe] is specified). - // Since we can't differentiate between the cases here, treat SIG_IGN as DEFAULT - // unconditionally. - if sigpipe_attr_specified && !(cfg!(bootstrap) && sigpipe == sigpipe::SIG_IGN) { + if sigpipe_attr_specified { UNIX_SIGPIPE_ATTR_SPECIFIED.store(true, crate::sync::atomic::Ordering::Relaxed); } if let Some(handler) = handler { |