Implements RFC 1937: ? in main
This is the first part of the RFC 1937 that supports new `Termination` trait in the rust `main` function.
This commit is contained in:
@@ -308,6 +308,7 @@
|
||||
#![feature(str_char)]
|
||||
#![feature(str_internals)]
|
||||
#![feature(str_utf16)]
|
||||
#![feature(termination_trait)]
|
||||
#![feature(test, rustc_private)]
|
||||
#![feature(thread_local)]
|
||||
#![feature(toowned_clone_into)]
|
||||
@@ -499,6 +500,11 @@ mod memchr;
|
||||
// The runtime entry point and a few unstable public functions used by the
|
||||
// compiler
|
||||
pub mod rt;
|
||||
// The trait to support returning arbitrary types in the main function
|
||||
mod termination;
|
||||
|
||||
#[unstable(feature = "termination_trait", issue = "0")]
|
||||
pub use self::termination::Termination;
|
||||
|
||||
// Include a number of private modules that exist solely to provide
|
||||
// the rustdoc documentation for primitive types. Using `include!`
|
||||
|
||||
@@ -26,7 +26,50 @@
|
||||
// Reexport some of our utilities which are expected by other crates.
|
||||
pub use panicking::{begin_panic, begin_panic_fmt, update_panic_count};
|
||||
|
||||
#[cfg(not(test))]
|
||||
#[cfg(not(any(test, stage0)))]
|
||||
#[lang = "start"]
|
||||
fn lang_start<T: ::termination::Termination + 'static>
|
||||
(main: fn() -> T, argc: isize, argv: *const *const u8) -> !
|
||||
{
|
||||
use panic;
|
||||
use sys;
|
||||
use sys_common;
|
||||
use sys_common::thread_info;
|
||||
use thread::Thread;
|
||||
use process;
|
||||
#[cfg(not(feature = "backtrace"))]
|
||||
use mem;
|
||||
|
||||
sys::init();
|
||||
|
||||
process::exit(unsafe {
|
||||
let main_guard = sys::thread::guard::init();
|
||||
sys::stack_overflow::init();
|
||||
|
||||
// Next, set up the current Thread with the guard information we just
|
||||
// created. Note that this isn't necessary in general for new threads,
|
||||
// but we just do this to name the main thread and to give it correct
|
||||
// info about the stack bounds.
|
||||
let thread = Thread::new(Some("main".to_owned()));
|
||||
thread_info::set(main_guard, thread);
|
||||
|
||||
// Store our args if necessary in a squirreled away location
|
||||
sys::args::init(argc, argv);
|
||||
|
||||
// Let's run some code!
|
||||
#[cfg(feature = "backtrace")]
|
||||
let exit_code = panic::catch_unwind(|| {
|
||||
::sys_common::backtrace::__rust_begin_short_backtrace(move || main().report())
|
||||
});
|
||||
#[cfg(not(feature = "backtrace"))]
|
||||
let exit_code = panic::catch_unwind(mem::transmute::<_, fn()>(main).report());
|
||||
|
||||
sys_common::cleanup();
|
||||
exit_code.unwrap_or(101)
|
||||
});
|
||||
}
|
||||
|
||||
#[cfg(all(not(test), stage0))]
|
||||
#[lang = "start"]
|
||||
fn lang_start(main: fn(), argc: isize, argv: *const *const u8) -> isize {
|
||||
use panic;
|
||||
|
||||
74
src/libstd/termination.rs
Normal file
74
src/libstd/termination.rs
Normal file
@@ -0,0 +1,74 @@
|
||||
// Copyright 2017 The Rust Project Developers. See the COPYRIGHT
|
||||
// file at the top-level directory of this distribution and at
|
||||
// http://rust-lang.org/COPYRIGHT.
|
||||
//
|
||||
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
|
||||
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
|
||||
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
|
||||
// option. This file may not be copied, modified, or distributed
|
||||
// except according to those terms.
|
||||
|
||||
use error::Error;
|
||||
use libc;
|
||||
|
||||
/// A trait for implementing arbitrary return types in the `main` function.
|
||||
///
|
||||
/// The c-main function only supports to return integers as return type.
|
||||
/// So, every type implementing the `Termination` trait has to be converted
|
||||
/// to an integer.
|
||||
///
|
||||
/// 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")]
|
||||
pub trait Termination {
|
||||
/// Is called to get the representation of the value as status code.
|
||||
/// This status code is returned to the operating system.
|
||||
fn report(self) -> i32;
|
||||
}
|
||||
|
||||
#[unstable(feature = "termination_trait", issue = "0")]
|
||||
impl Termination for () {
|
||||
fn report(self) -> i32 { libc::EXIT_SUCCESS }
|
||||
}
|
||||
|
||||
#[unstable(feature = "termination_trait", issue = "0")]
|
||||
impl<T: Termination, E: Error> Termination for Result<T, E> {
|
||||
fn report(self) -> i32 {
|
||||
match self {
|
||||
Ok(val) => val.report(),
|
||||
Err(err) => {
|
||||
print_error(err);
|
||||
libc::EXIT_FAILURE
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
#[unstable(feature = "termination_trait", issue = "0")]
|
||||
fn print_error<E: Error>(err: E) {
|
||||
eprintln!("Error: {}", err.description());
|
||||
|
||||
if let Some(ref err) = err.cause() {
|
||||
eprintln!("Caused by: {}", err.description());
|
||||
}
|
||||
}
|
||||
|
||||
#[unstable(feature = "termination_trait", issue = "0")]
|
||||
impl Termination for ! {
|
||||
fn report(self) -> i32 { unreachable!(); }
|
||||
}
|
||||
|
||||
#[unstable(feature = "termination_trait", issue = "0")]
|
||||
impl Termination for bool {
|
||||
fn report(self) -> i32 {
|
||||
if self { libc::EXIT_SUCCESS } else { libc::EXIT_FAILURE }
|
||||
}
|
||||
}
|
||||
|
||||
#[unstable(feature = "termination_trait", issue = "0")]
|
||||
impl Termination for i32 {
|
||||
fn report(self) -> i32 {
|
||||
self
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user