diff options
| author | bors <bors@rust-lang.org> | 2017-08-16 21:00:21 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2017-08-16 21:00:21 +0000 |
| commit | 7ac979d8cbe97241fd39f4037e1d4069caaff4d2 (patch) | |
| tree | 32d267345c20b109c744b01962c525961550ce54 /src/libsyntax | |
| parent | 3f94b7103bef77b22ff436b148792834b9e44065 (diff) | |
| parent | 014333fbd422f56628a2b5b707d192cef838afc3 (diff) | |
| download | rust-7ac979d8cbe97241fd39f4037e1d4069caaff4d2.tar.gz rust-7ac979d8cbe97241fd39f4037e1d4069caaff4d2.zip | |
Auto merge of #43838 - eddyb:stable-rvalue-promotion, r=arielb1
Stabilize rvalue promotion to 'static. Closes #38865. Documentation PR at rust-lang-nursery/reference#98.
Diffstat (limited to 'src/libsyntax')
| -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 7b2a31b5705..801343689b7 100644 --- a/src/libsyntax/feature_gate.rs +++ b/src/libsyntax/feature_gate.rs @@ -345,9 +345,6 @@ declare_features! ( // Allows `repr(align(u16))` struct attribute (RFC 1358) (active, repr_align, "1.17.0", Some(33626)), - // See rust-lang/rfcs#1414. Allows code like `let x: &'static u32 = &42` to work. - (active, rvalue_static_promotion, "1.15.1", Some(38865)), - // Used to preserve symbols (see llvm.used) (active, used, "1.18.0", Some(40289)), @@ -457,6 +454,8 @@ declare_features! ( (accepted, associated_consts, "1.20.0", Some(29646)), // Usage of the `compile_error!` macro (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)), ); // If you change this, please modify src/doc/unstable-book as well. You must |