diff options
| author | bors <bors@rust-lang.org> | 2017-12-27 15:41:51 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2017-12-27 15:41:51 +0000 |
| commit | bfbb1f5ce1e6a85a03219767cfc5c9bab3f7bf9e (patch) | |
| tree | b72634f6bee5eb0e51d428fe53ecd1c28c11b907 /src/libstd/sys_common | |
| parent | 63efff5a71269ae22b8769e2e6f9aaa2f940f823 (diff) | |
| parent | 09f94bea4aca7696b58dd7e6668ca27d71908984 (diff) | |
| download | rust-bfbb1f5ce1e6a85a03219767cfc5c9bab3f7bf9e.tar.gz rust-bfbb1f5ce1e6a85a03219767cfc5c9bab3f7bf9e.zip | |
Auto merge of #46479 - bkchr:termination_trait, r=arielb1
Implements RFC 1937: `?` in `main` This is the first part of the RFC 1937 that supports new `Termination` trait in the rust `main` function. Thanks @nikomatsakis, @arielb1 and all other people in the gitter channel for all your help! The support for doctest and `#[test]` is still missing, bu as @nikomatsakis said, smaller pull requests are better :)
Diffstat (limited to 'src/libstd/sys_common')
| -rw-r--r-- | src/libstd/sys_common/backtrace.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libstd/sys_common/backtrace.rs b/src/libstd/sys_common/backtrace.rs index b5cf6d7d34f..36cbce2df75 100644 --- a/src/libstd/sys_common/backtrace.rs +++ b/src/libstd/sys_common/backtrace.rs @@ -128,7 +128,7 @@ fn filter_frames(frames: &[Frame], /// Fixed frame used to clean the backtrace with `RUST_BACKTRACE=1`. #[inline(never)] pub fn __rust_begin_short_backtrace<F, T>(f: F) -> T - where F: FnOnce() -> T, F: Send + 'static, T: Send + 'static + where F: FnOnce() -> T, F: Send, T: Send { f() } |