diff options
| author | bors <bors@rust-lang.org> | 2017-01-19 16:09:42 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2017-01-19 16:09:42 +0000 |
| commit | 47965f51e6d91ae33bf2b0da0f5510f03766feac (patch) | |
| tree | ff736fc78a6f5abd28bedd30820a8a1eb689824a /src/libsyntax | |
| parent | 74c42ac173bee900979870ed986c760596d1fbdb (diff) | |
| parent | 3946079d3793eb3324d650d8bdc7e826bdbe2689 (diff) | |
| download | rust-47965f51e6d91ae33bf2b0da0f5510f03766feac.tar.gz rust-47965f51e6d91ae33bf2b0da0f5510f03766feac.zip | |
Auto merge of #39180 - GuillaumeGomez:rollup, r=GuillaumeGomez
Rollup of 11 pull requests - Successful merges: #38457, #38922, #38970, #39039, #39091, #39115, #39121, #39149, #39150, #39151, #39165 - Failed merges:
Diffstat (limited to 'src/libsyntax')
| -rw-r--r-- | src/libsyntax/feature_gate.rs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/libsyntax/feature_gate.rs b/src/libsyntax/feature_gate.rs index ba6e752d310..fb75201cea5 100644 --- a/src/libsyntax/feature_gate.rs +++ b/src/libsyntax/feature_gate.rs @@ -689,10 +689,10 @@ pub const BUILTIN_ATTRIBUTES: &'static [(&'static str, AttributeType, AttributeG cfg_fn!(omit_gdb_pretty_printer_section))), ("unsafe_destructor_blind_to_params", Normal, - Gated(Stability::Unstable, + Gated(Stability::Deprecated("https://github.com/rust-lang/rust/issues/34761"), "dropck_parametricity", - "unsafe_destructor_blind_to_params has unstable semantics \ - and may be removed in the future", + "unsafe_destructor_blind_to_params has been replaced by \ + may_dangle and will be removed in the future", cfg_fn!(dropck_parametricity))), ("may_dangle", Normal, |