diff options
| author | bors <bors@rust-lang.org> | 2022-12-29 01:24:26 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2022-12-29 01:24:26 +0000 |
| commit | b15ca6635f752fefebfd101aa944c6167128183c (patch) | |
| tree | 6b1f604d2bd07d58e024a9411dfdf6dac237d0d3 /library/std/src/process.rs | |
| parent | 9709a438721d679572f0f7c389cd1fa60922fbef (diff) | |
| parent | cc4e434854a982e22ca207c298e63f88dc5128aa (diff) | |
| download | rust-b15ca6635f752fefebfd101aa944c6167128183c.tar.gz rust-b15ca6635f752fefebfd101aa944c6167128183c.zip | |
Auto merge of #105741 - pietroalbini:pa-1.68-nightly, r=Mark-Simulacrum
Bump master bootstrap compiler This PR bumps the bootstrap compiler to the beta created earlier this week, cherry-picks the stabilization version number updates, and updates the `cfg(bootstrap)`s. r? `@Mark-Simulacrum`
Diffstat (limited to 'library/std/src/process.rs')
| -rw-r--r-- | library/std/src/process.rs | 17 |
1 files changed, 5 insertions, 12 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. |