diff options
| author | bors <bors@rust-lang.org> | 2019-09-26 08:42:34 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2019-09-26 08:42:34 +0000 |
| commit | 134004f74db3b4626bde37cc068d9ae6dedd2d38 (patch) | |
| tree | f0c0cd46c057791d6a65b4a1bce470f262ecfee3 /src/libsyntax | |
| parent | dc45735f29788924b9fc351d100e5bf3ebdca162 (diff) | |
| parent | e70724c23bd2bd5cfbbac784d103f2a61a40284f (diff) | |
| download | rust-134004f74db3b4626bde37cc068d9ae6dedd2d38.tar.gz rust-134004f74db3b4626bde37cc068d9ae6dedd2d38.zip | |
Auto merge of #62661 - arielb1:never-reserve, r=nikomatsakis
reserve `impl<T> From<!> for T` this is necessary for never-type stabilization. cc #57012 #35121 I think we wanted a crater run for this @nikomatsakis? r? @nikomatsakis
Diffstat (limited to 'src/libsyntax')
| -rw-r--r-- | src/libsyntax/feature_gate/builtin_attrs.rs | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/libsyntax/feature_gate/builtin_attrs.rs b/src/libsyntax/feature_gate/builtin_attrs.rs index b6e13200f32..d14afc6deaa 100644 --- a/src/libsyntax/feature_gate/builtin_attrs.rs +++ b/src/libsyntax/feature_gate/builtin_attrs.rs @@ -457,7 +457,6 @@ pub const BUILTIN_ATTRIBUTES: &[BuiltinAttribute] = &[ // ========================================================================== // Internal attributes, Misc: // ========================================================================== - gated!( lang, Normal, template!(NameValueStr: "name"), lang_items, "language items are subject to change", @@ -498,6 +497,10 @@ pub const BUILTIN_ATTRIBUTES: &[BuiltinAttribute] = &[ overflow checking behavior of several libcore functions that are inlined \ across crates and will never be stable", ), + rustc_attr!(rustc_reservation_impl, Normal, template!(NameValueStr: "reservation message"), + "the `#[rustc_reservation_impl]` attribute is internally used \ + for reserving for `for<T> From<!> for T` impl" + ), rustc_attr!( rustc_test_marker, Normal, template!(Word), "the `#[rustc_test_marker]` attribute is used internally to track tests", |