diff options
Diffstat (limited to 'src/libsyntax')
| -rw-r--r-- | src/libsyntax/feature_gate.rs | 5 | ||||
| -rw-r--r-- | src/libsyntax/json.rs | 2 |
2 files changed, 3 insertions, 4 deletions
diff --git a/src/libsyntax/feature_gate.rs b/src/libsyntax/feature_gate.rs index 09762417c1c..71c1f791470 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)), @@ -461,6 +458,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 diff --git a/src/libsyntax/json.rs b/src/libsyntax/json.rs index 19238c30670..37a59411c16 100644 --- a/src/libsyntax/json.rs +++ b/src/libsyntax/json.rs @@ -11,7 +11,7 @@ //! A JSON emitter for errors. //! //! This works by converting errors to a simplified structural format (see the -//! structs at the start of the file) and then serialising them. These should +//! structs at the start of the file) and then serializing them. These should //! contain as much information about the error as possible. //! //! The format of the JSON output should be considered *unstable*. For now the |