diff options
| author | bors <bors@rust-lang.org> | 2017-09-13 03:04:49 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2017-09-13 03:04:49 +0000 |
| commit | 7eefed392f926958233529f6c1307aa007802046 (patch) | |
| tree | 8a0c1c0eadc78a7d786bc2ccc20c73a1cb6f6988 /src/libsyntax/feature_gate.rs | |
| parent | 2fdccaffe632e316c43224d0fae6fba903333aa3 (diff) | |
| parent | 5601ae4b72ff7763735b3881d443a0755005f8eb (diff) | |
| download | rust-7eefed392f926958233529f6c1307aa007802046.tar.gz rust-7eefed392f926958233529f6c1307aa007802046.zip | |
Auto merge of #44456 - eddyb:stable-drop-const, r=nikomatsakis
Stabilize drop_types_in_const. Closes #33156, stabilizing the new, revised, rules, and improving the error message. r? @nikomatsakis cc @SergioBenitez
Diffstat (limited to 'src/libsyntax/feature_gate.rs')
| -rw-r--r-- | src/libsyntax/feature_gate.rs | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/libsyntax/feature_gate.rs b/src/libsyntax/feature_gate.rs index e9e9c6bf4ea..3d4ded2ae81 100644 --- a/src/libsyntax/feature_gate.rs +++ b/src/libsyntax/feature_gate.rs @@ -269,9 +269,6 @@ declare_features! ( // impl specialization (RFC 1210) (active, specialization, "1.7.0", Some(31844)), - // Allow Drop types in statics/const functions (RFC 1440) - (active, drop_types_in_const, "1.9.0", Some(33156)), - // Allows cfg(target_has_atomic = "..."). (active, cfg_target_has_atomic, "1.9.0", Some(32976)), @@ -469,6 +466,8 @@ declare_features! ( (accepted, compile_error, "1.20.0", Some(40872)), // See rust-lang/rfcs#1414. Allows code like `let x: &'static u32 = &42` to work. (accepted, rvalue_static_promotion, "1.21.0", Some(38865)), + // Allow Drop types in constants (RFC 1440) + (accepted, drop_types_in_const, "1.22.0", Some(33156)), ); // If you change this, please modify src/doc/unstable-book as well. You must |