Merge remote-tracking branch 'origin/master' into gen

This commit is contained in:
Alex Crichton
2017-08-25 07:15:12 -07:00
101 changed files with 3017 additions and 1440 deletions

View File

@@ -122,7 +122,7 @@
#![feature(unsize)]
#![feature(allocator_internals)]
#![cfg_attr(not(test), feature(fused, fn_traits, placement_new_protocol))]
#![cfg_attr(not(test), feature(fused, fn_traits, placement_new_protocol, swap_with_slice))]
#![cfg_attr(test, feature(test, box_heap))]
// Allow testing this library