diff options
| author | Bastian Köcher <git@kchr.de> | 2017-12-22 01:11:57 +0100 |
|---|---|---|
| committer | Bastian Köcher <git@kchr.de> | 2017-12-26 12:26:39 +0100 |
| commit | c7a57d285517f1e22d34ace98fbb0c64e40b12bc (patch) | |
| tree | 10d2643b4e5e8db44f46d77916dd899710b744f5 /src/libstd | |
| parent | 8f539b09df7f47c3b962c28179803ae0289bfe5e (diff) | |
| download | rust-c7a57d285517f1e22d34ace98fbb0c64e40b12bc.tar.gz rust-c7a57d285517f1e22d34ace98fbb0c64e40b12bc.zip | |
Adds termination_trait feature gate
Diffstat (limited to 'src/libstd')
| -rw-r--r-- | src/libstd/lib.rs | 2 | ||||
| -rw-r--r-- | src/libstd/termination.rs | 14 |
2 files changed, 8 insertions, 8 deletions
diff --git a/src/libstd/lib.rs b/src/libstd/lib.rs index 3a7a57fe2b8..171c108e3aa 100644 --- a/src/libstd/lib.rs +++ b/src/libstd/lib.rs @@ -503,7 +503,7 @@ pub mod rt; // The trait to support returning arbitrary types in the main function mod termination; -#[unstable(feature = "termination_trait", issue = "0")] +#[unstable(feature = "termination_trait", issue = "43301")] pub use self::termination::Termination; // Include a number of private modules that exist solely to provide diff --git a/src/libstd/termination.rs b/src/libstd/termination.rs index 5eeaa542b41..ee1dc5470a8 100644 --- a/src/libstd/termination.rs +++ b/src/libstd/termination.rs @@ -20,7 +20,7 @@ use libc; /// The default implementations are returning `libc::EXIT_SUCCESS` to indicate /// a successful execution. In case of a failure, `libc::EXIT_FAILURE` is returned. #[cfg_attr(not(stage0), lang = "termination")] -#[unstable(feature = "termination_trait", issue = "0")] +#[unstable(feature = "termination_trait", issue = "43301")] #[rustc_on_unimplemented = "`main` can only return types that implement {Termination}, not `{Self}`"] pub trait Termination { @@ -29,12 +29,12 @@ pub trait Termination { fn report(self) -> i32; } -#[unstable(feature = "termination_trait", issue = "0")] +#[unstable(feature = "termination_trait", issue = "43301")] impl Termination for () { fn report(self) -> i32 { libc::EXIT_SUCCESS } } -#[unstable(feature = "termination_trait", issue = "0")] +#[unstable(feature = "termination_trait", issue = "43301")] impl<T: Termination, E: Error> Termination for Result<T, E> { fn report(self) -> i32 { match self { @@ -47,7 +47,7 @@ impl<T: Termination, E: Error> Termination for Result<T, E> { } } -#[unstable(feature = "termination_trait", issue = "0")] +#[unstable(feature = "termination_trait", issue = "43301")] fn print_error<E: Error>(err: E) { eprintln!("Error: {}", err.description()); @@ -56,19 +56,19 @@ fn print_error<E: Error>(err: E) { } } -#[unstable(feature = "termination_trait", issue = "0")] +#[unstable(feature = "termination_trait", issue = "43301")] impl Termination for ! { fn report(self) -> i32 { unreachable!(); } } -#[unstable(feature = "termination_trait", issue = "0")] +#[unstable(feature = "termination_trait", issue = "43301")] impl Termination for bool { fn report(self) -> i32 { if self { libc::EXIT_SUCCESS } else { libc::EXIT_FAILURE } } } -#[unstable(feature = "termination_trait", issue = "0")] +#[unstable(feature = "termination_trait", issue = "43301")] impl Termination for i32 { fn report(self) -> i32 { self |