diff options
| author | kennytm <kennytm@gmail.com> | 2018-03-25 01:26:32 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-03-25 01:26:32 +0800 |
| commit | 8d57071cbbdf3a5e7006cae303d6d14c905c8fc0 (patch) | |
| tree | 229615e8e20c9c83ea7588b1edfbd374273d867b /src/libsyntax/feature_gate.rs | |
| parent | c892e683872725b9d9b4ed0ed5bd53281313bc38 (diff) | |
| parent | 2b13d95da02d318c12814261dd36edd91ae6879e (diff) | |
| download | rust-8d57071cbbdf3a5e7006cae303d6d14c905c8fc0.tar.gz rust-8d57071cbbdf3a5e7006cae303d6d14c905c8fc0.zip | |
Rollup merge of #49162 - tmandry:stabilize-termination-trait, r=nikomatsakis
Stabilize termination_trait, split out termination_trait_test For #48453. First time contribution, so I'd really appreciate any feedback on how this PR can be better. Not sure exactly what kind of documentation update is needed. If there is no PR to update the reference, I can try doing that this week as I have time.
Diffstat (limited to 'src/libsyntax/feature_gate.rs')
| -rw-r--r-- | src/libsyntax/feature_gate.rs | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/libsyntax/feature_gate.rs b/src/libsyntax/feature_gate.rs index 69612054ae3..35642312e6d 100644 --- a/src/libsyntax/feature_gate.rs +++ b/src/libsyntax/feature_gate.rs @@ -428,8 +428,8 @@ declare_features! ( // `foo.rs` as an alternative to `foo/mod.rs` (active, non_modrs_mods, "1.24.0", Some(44660), None), - // Termination trait in main (RFC 1937) - (active, termination_trait, "1.24.0", Some(43301), None), + // Termination trait in tests (RFC 1937) + (active, termination_trait_test, "1.24.0", Some(48854), None), // Allows use of the :lifetime macro fragment specifier (active, macro_lifetime_matcher, "1.24.0", Some(46895), None), @@ -565,6 +565,8 @@ declare_features! ( (accepted, inclusive_range_syntax, "1.26.0", Some(28237), None), // allow `..=` in patterns (RFC 1192) (accepted, dotdoteq_in_patterns, "1.26.0", Some(28237), None), + // Termination trait in main (RFC 1937) + (accepted, termination_trait, "1.26.0", Some(43301), None), ); // If you change this, please modify src/doc/unstable-book as well. You must |