diff options
| author | Alex Crichton <alex@alexcrichton.com> | 2015-02-11 14:03:33 -0800 |
|---|---|---|
| committer | Alex Crichton <alex@alexcrichton.com> | 2015-02-11 14:03:33 -0800 |
| commit | aa0db172de42a981a64730df146ccf3d737c5762 (patch) | |
| tree | 7d21ce7129816675cdb331386090e6c96f0d9580 /src/libstd | |
| parent | 9492275106dd4d564a036517ff4726feacaf0720 (diff) | |
| parent | f9a1087f2730ab021d5356a5df703baeccffc020 (diff) | |
| download | rust-aa0db172de42a981a64730df146ccf3d737c5762.tar.gz rust-aa0db172de42a981a64730df146ccf3d737c5762.zip | |
rollup merge of #22178: pnkfelix/featuregate-unsafe-no-drop-flag
Conflicts: src/libsyntax/feature_gate.rs
Diffstat (limited to 'src/libstd')
| -rw-r--r-- | src/libstd/lib.rs | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/libstd/lib.rs b/src/libstd/lib.rs index 77423cdcd31..b3b65564c40 100644 --- a/src/libstd/lib.rs +++ b/src/libstd/lib.rs @@ -111,7 +111,7 @@ #![feature(core)] #![feature(hash)] #![feature(int_uint)] -#![feature(lang_items, unsafe_destructor)] +#![feature(lang_items)] #![feature(libc)] #![feature(linkage, thread_local, asm)] #![feature(old_impl_check)] @@ -120,6 +120,8 @@ #![feature(staged_api)] #![feature(unboxed_closures)] #![feature(unicode)] +#![feature(unsafe_destructor)] +#![feature(unsafe_no_drop_flag)] #![feature(macro_reexport)] #![cfg_attr(test, feature(test))] |