diff options
| author | bors <bors@rust-lang.org> | 2017-10-13 17:42:25 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2017-10-13 17:42:25 +0000 |
| commit | 6cb49d2a3e86f0d2f220f12c59c0ebb2965ff38c (patch) | |
| tree | 601f0856be5a7da5d29c176fb415f7b803643670 /src/liballoc/lib.rs | |
| parent | 305e02281bf6e7a5398f93f86c901316074be0a5 (diff) | |
| parent | 8ea67902934728378acdd84a6050b9b4bed03ad5 (diff) | |
| download | rust-6cb49d2a3e86f0d2f220f12c59c0ebb2965ff38c.tar.gz rust-6cb49d2a3e86f0d2f220f12c59c0ebb2965ff38c.zip | |
Auto merge of #45261 - kennytm:rollup, r=kennytm
Rollup of 14 pull requests - Successful merges: #44855, #45110, #45122, #45133, #45173, #45178, #45189, #45203, #45209, #45221, #45236, #45240, #45245, #45253 - Failed merges:
Diffstat (limited to 'src/liballoc/lib.rs')
| -rw-r--r-- | src/liballoc/lib.rs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/liballoc/lib.rs b/src/liballoc/lib.rs index d51aaa23c6a..0cbfc9e9dac 100644 --- a/src/liballoc/lib.rs +++ b/src/liballoc/lib.rs @@ -121,6 +121,7 @@ #![feature(unique)] #![feature(unsize)] #![feature(allocator_internals)] +#![feature(on_unimplemented)] #![cfg_attr(not(test), feature(fused, fn_traits, placement_new_protocol, swap_with_slice, i128))] #![cfg_attr(test, feature(test, box_heap))] |