-
Notifications
You must be signed in to change notification settings - Fork 13k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Better docs and associated SUCCESS/FAILURE for process::ExitCode #48618
Changes from 1 commit
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -1080,15 +1080,58 @@ impl fmt::Display for ExitStatus { | |
} | ||
} | ||
|
||
/// This is ridiculously unstable, as it's a completely-punted-upon part | ||
/// of the `?`-in-`main` RFC. It's here only to allow experimenting with | ||
/// returning a code directly from main. It will definitely change | ||
/// drastically before being stabilized, if it doesn't just get deleted. | ||
#[doc(hidden)] | ||
/// This type represents the status code a process can return to its | ||
/// parent under normal termination. | ||
/// | ||
/// Numeric values used in this type don't have portable meanings, and | ||
/// different platforms may mask different amounts of them. | ||
/// | ||
/// For the platform's canonical successful and unsuccessful codes, see | ||
/// the [`SUCCESS`] and [`FAILURE`] associated items. | ||
/// | ||
/// [`SUCCESS`]: #constant.SUCCESS | ||
/// [`FAILURE`]: #constant.FAILURE | ||
/// | ||
/// **Warning**: While various forms of this were discussed in [RFC #1937], | ||
/// it was ultimately cut from that RFC, and thus this type is more subject | ||
/// to change even than the usual unstable item churn. | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. as an aside, I just ran into a place where I really wanted this today. I was already calling |
||
/// | ||
/// [RFC #1937]: https://github.com/rust-lang/rfcs/pull/1937 | ||
#[derive(Clone, Copy, Debug)] | ||
#[unstable(feature = "process_exitcode_placeholder", issue = "43301")] | ||
pub struct ExitCode(pub i32); | ||
|
||
#[cfg(target_arch = "wasm32")] | ||
mod rawexit { | ||
pub const SUCCESS: i32 = 0; | ||
pub const FAILURE: i32 = 1; | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. do we still need this? There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Er I'm not sure I added this... This actually should be rejected by the tidy lint as well... In any case seems fine to have if it's needed, we can clean it up later There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This private mod is originally from https://github.com/rust-lang/rust/pull/46479/files#diff-7dbed9a9f4aeab33f13e792758ac1ed5R13 Did you mean not have the wasm check? Or not have the mod? I can do either or both... There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Er sorry what I mean is that we have lint which forbids It's ok to not fix this up here, but if you're feeling enterprising this would just involve moving the modules to There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I think the main question I had was "does wasm offer the standard constants" -- note though that this code is pre-existing, though it's been moved around, so the lint must not work that well... |
||
} | ||
#[cfg(not(target_arch = "wasm32"))] | ||
mod rawexit { | ||
use libc; | ||
pub const SUCCESS: i32 = libc::EXIT_SUCCESS; | ||
pub const FAILURE: i32 = libc::EXIT_FAILURE; | ||
} | ||
|
||
#[unstable(feature = "process_exitcode_placeholder", issue = "43301")] | ||
impl ExitCode { | ||
/// The canonical ExitCode for successful termination on this platform. | ||
/// | ||
/// Note that a `()`-returning `main` implicitly results in a successful | ||
/// termination, so there's no need to return this from `main` unless | ||
/// you're also returning other possible codes. | ||
#[unstable(feature = "process_exitcode_placeholder", issue = "43301")] | ||
pub const SUCCESS: ExitCode = ExitCode(rawexit::SUCCESS); | ||
|
||
/// The canonical ExitCode for unsuccessful termination on this platform. | ||
/// | ||
/// If you're only returning this and `SUCCESS` from `main`, consider | ||
/// instead returning `Err(_)` and `Ok(())` respectively, which will | ||
/// return the same codes (but will also `eprintln!` the error). | ||
#[unstable(feature = "process_exitcode_placeholder", issue = "43301")] | ||
pub const FAILURE: ExitCode = ExitCode(rawexit::FAILURE); | ||
} | ||
|
||
impl Child { | ||
/// Forces the child to exit. This is equivalent to sending a | ||
/// SIGKILL on unix platforms. | ||
|
@@ -1401,18 +1444,6 @@ pub fn id() -> u32 { | |
::sys::os::getpid() | ||
} | ||
|
||
#[cfg(target_arch = "wasm32")] | ||
mod exit { | ||
pub const SUCCESS: i32 = 0; | ||
pub const FAILURE: i32 = 1; | ||
} | ||
#[cfg(not(target_arch = "wasm32"))] | ||
mod exit { | ||
use libc; | ||
pub const SUCCESS: i32 = libc::EXIT_SUCCESS; | ||
pub const FAILURE: i32 = libc::EXIT_FAILURE; | ||
} | ||
|
||
/// A trait for implementing arbitrary return types in the `main` function. | ||
/// | ||
/// The c-main function only supports to return integers as return type. | ||
|
@@ -1433,18 +1464,15 @@ pub trait Termination { | |
|
||
#[unstable(feature = "termination_trait_lib", issue = "43301")] | ||
impl Termination for () { | ||
fn report(self) -> i32 { exit::SUCCESS } | ||
fn report(self) -> i32 { ExitCode::SUCCESS.report() } | ||
} | ||
|
||
#[unstable(feature = "termination_trait_lib", issue = "43301")] | ||
impl<E: fmt::Debug> Termination for Result<(), E> { | ||
fn report(self) -> i32 { | ||
match self { | ||
Ok(val) => val.report(), | ||
Err(err) => { | ||
eprintln!("Error: {:?}", err); | ||
exit::FAILURE | ||
} | ||
Ok(()) => ().report(), | ||
Err(err) => Err::<!, _>(err).report(), | ||
} | ||
} | ||
} | ||
|
@@ -1459,7 +1487,7 @@ impl<E: fmt::Debug> Termination for Result<!, E> { | |
fn report(self) -> i32 { | ||
let Err(err) = self; | ||
eprintln!("Error: {:?}", err); | ||
exit::FAILURE | ||
ExitCode::FAILURE.report() | ||
} | ||
} | ||
|
||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -14,5 +14,5 @@ | |
use std::process::ExitCode; | ||
|
||
fn main() -> ExitCode { | ||
ExitCode(0) | ||
ExitCode::SUCCESS | ||
} |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.