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/libsyntax | |
| 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/libsyntax')
| -rw-r--r-- | src/libsyntax/feature_gate.rs | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/libsyntax/feature_gate.rs b/src/libsyntax/feature_gate.rs index 1676925989c..7ae360678cd 100644 --- a/src/libsyntax/feature_gate.rs +++ b/src/libsyntax/feature_gate.rs @@ -444,6 +444,9 @@ declare_features! ( // Nested `impl Trait` (active, nested_impl_trait, "1.24.0", Some(34511)), + + // Termination trait in main (RFC 1937) + (active, termination_trait, "1.24.0", Some(43301)), ); declare_features! ( |