Skip to content

Commit

Permalink
Rollup merge of rust-lang#38970 - apasel422:may-dangle, r=pnkfelix
Browse files Browse the repository at this point in the history
Deprecate `#[unsafe_destructor_blind_to_params]`

CC rust-lang#34761

r? @pnkfelix
  • Loading branch information
GuillaumeGomez authored Jan 19, 2017
2 parents cabfb07 + 9940db6 commit 223e084
Show file tree
Hide file tree
Showing 3 changed files with 26 additions and 4 deletions.
6 changes: 3 additions & 3 deletions src/libsyntax/feature_gate.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
22 changes: 22 additions & 0 deletions src/test/compile-fail/feature-gate-dropck-ugeh-2.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
// file at the top-level directory of this distribution and at
// http://rust-lang.org/COPYRIGHT.
//
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
// option. This file may not be copied, modified, or distributed
// except according to those terms.

#![deny(deprecated)]
#![feature(dropck_parametricity)]

struct Foo;

impl Drop for Foo {
#[unsafe_destructor_blind_to_params]
//~^ ERROR use of deprecated attribute `dropck_parametricity`
fn drop(&mut self) {}
}

fn main() {}
2 changes: 1 addition & 1 deletion src/test/compile-fail/feature-gate-dropck-ugeh.rs
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ struct Foo<T> { data: Vec<T> }

impl<T> Drop for Foo<T> {
#[unsafe_destructor_blind_to_params] // This is the UGEH attribute
//~^ ERROR unsafe_destructor_blind_to_params has unstable semantics
//~^ ERROR unsafe_destructor_blind_to_params has been replaced
fn drop(&mut self) { }
}

Expand Down

0 comments on commit 223e084

Please sign in to comment.