Skip to content

Commit f164254

Browse files
committed
Rollup merge of #22787 - pnkfelix:reenable-gate-for-unsafe_no_drop_flag, r=alexcrichton
Turn `unsafe_no_drop_flag` back into a gated-feature. Fix #22173
2 parents 1f2b3eb + 5d7e283 commit f164254

File tree

2 files changed

+26
-1
lines changed

2 files changed

+26
-1
lines changed

src/libsyntax/feature_gate.rs

+3-1
Original file line numberDiff line numberDiff line change
@@ -243,7 +243,9 @@ pub static KNOWN_ATTRIBUTES: &'static [(&'static str, AttributeType)] = &[
243243
("static_assert", Whitelisted),
244244
("no_debug", Whitelisted),
245245
("omit_gdb_pretty_printer_section", Whitelisted),
246-
("unsafe_no_drop_flag", Whitelisted),
246+
("unsafe_no_drop_flag", Gated("unsafe_no_drop_flag",
247+
"unsafe_no_drop_flag has unstable semantics \
248+
and may be removed in the future")),
247249

248250
// used in resolve
249251
("prelude_import", Whitelisted),
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
// Copyright 2015 The Rust Project Developers. See the COPYRIGHT
2+
// file at the top-level directory of this distribution and at
3+
// http://rust-lang.org/COPYRIGHT.
4+
//
5+
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
6+
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
7+
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
8+
// option. This file may not be copied, modified, or distributed
9+
// except according to those terms.
10+
11+
pub struct T;
12+
13+
#[unsafe_no_drop_flag]
14+
//~^ ERROR unsafe_no_drop_flag has unstable semantics and may be removed
15+
pub struct S {
16+
pub x: T,
17+
}
18+
19+
impl Drop for S {
20+
fn drop(&mut self) {}
21+
}
22+
23+
pub fn main() {}

0 commit comments

Comments
 (0)