diff options
| author | bors <bors@rust-lang.org> | 2017-01-10 14:08:21 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2017-01-10 14:08:21 +0000 |
| commit | 7bffede97cf58f7159e261eac592f9cf88ce209d (patch) | |
| tree | ffa2c2c7fbc25c4c6e6684d28f98331c78e2779d /src/liballoc/lib.rs | |
| parent | 78c892d8659ae1cf1717b9a8a4bb407d8667f672 (diff) | |
| parent | db74f11f78e13fe2bbfb4e284c832d520fa5cf87 (diff) | |
| download | rust-7bffede97cf58f7159e261eac592f9cf88ce209d.tar.gz rust-7bffede97cf58f7159e261eac592f9cf88ce209d.zip | |
Auto merge of #38958 - sanxiyn:rollup, r=sanxiyn
Rollup of 11 pull requests - Successful merges: #38606, #38607, #38623, #38664, #38799, #38816, #38836, #38839, #38841, #38849, #38874 - Failed merges: #38845
Diffstat (limited to 'src/liballoc/lib.rs')
| -rw-r--r-- | src/liballoc/lib.rs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/liballoc/lib.rs b/src/liballoc/lib.rs index 9ca9f93f3d3..c67106cf57a 100644 --- a/src/liballoc/lib.rs +++ b/src/liballoc/lib.rs @@ -79,9 +79,10 @@ #![feature(const_fn)] #![feature(core_intrinsics)] #![feature(custom_attribute)] -#![feature(dropck_parametricity)] +#![feature(dropck_eyepatch)] #![cfg_attr(not(test), feature(exact_size_is_empty))] #![feature(fundamental)] +#![feature(generic_param_attrs)] #![feature(lang_items)] #![feature(needs_allocator)] #![feature(optin_builtin_traits)] |