mirror of
https://github.com/rust-lang/rust.git
synced 2024-12-14 09:36:06 +00:00
Restrict the Termination impls to simplify stabilization
Make a minimal commitment for stabilization. More impls are likely in future, but are not necessary at this time.
This commit is contained in:
parent
026339e42b
commit
e20f7b2ea7
@ -1080,6 +1080,15 @@ 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)]
|
||||
#[derive(Clone, Copy, Debug)]
|
||||
#[unstable(feature = "process_exitcode_placeholder", issue = "43301")]
|
||||
pub struct ExitCode(pub i32);
|
||||
|
||||
impl Child {
|
||||
/// Forces the child to exit. This is equivalent to sending a
|
||||
/// SIGKILL on unix platforms.
|
||||
@ -1428,7 +1437,7 @@ impl Termination for () {
|
||||
}
|
||||
|
||||
#[unstable(feature = "termination_trait_lib", issue = "43301")]
|
||||
impl<T: Termination, E: fmt::Debug> Termination for Result<T, E> {
|
||||
impl<E: fmt::Debug> Termination for Result<(), E> {
|
||||
fn report(self) -> i32 {
|
||||
match self {
|
||||
Ok(val) => val.report(),
|
||||
@ -1442,20 +1451,23 @@ impl<T: Termination, E: fmt::Debug> Termination for Result<T, E> {
|
||||
|
||||
#[unstable(feature = "termination_trait_lib", issue = "43301")]
|
||||
impl Termination for ! {
|
||||
fn report(self) -> i32 { unreachable!(); }
|
||||
fn report(self) -> i32 { self }
|
||||
}
|
||||
|
||||
#[unstable(feature = "termination_trait_lib", issue = "43301")]
|
||||
impl Termination for bool {
|
||||
impl<E: fmt::Debug> Termination for Result<!, E> {
|
||||
fn report(self) -> i32 {
|
||||
if self { exit::SUCCESS } else { exit::FAILURE }
|
||||
let Err(err) = self;
|
||||
eprintln!("Error: {:?}", err);
|
||||
exit::FAILURE
|
||||
}
|
||||
}
|
||||
|
||||
#[unstable(feature = "termination_trait_lib", issue = "43301")]
|
||||
impl Termination for i32 {
|
||||
impl Termination for ExitCode {
|
||||
fn report(self) -> i32 {
|
||||
self
|
||||
let ExitCode(code) = self;
|
||||
code
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -9,7 +9,10 @@
|
||||
// except according to those terms.
|
||||
|
||||
#![feature(termination_trait)]
|
||||
#![feature(process_exitcode_placeholder)]
|
||||
|
||||
fn main() -> i32 {
|
||||
0
|
||||
use std::process::ExitCode;
|
||||
|
||||
fn main() -> ExitCode {
|
||||
ExitCode(0)
|
||||
}
|
Loading…
Reference in New Issue
Block a user