diff options
| author | bors <bors@rust-lang.org> | 2016-08-27 03:07:48 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-08-27 03:07:48 -0700 |
| commit | 099b9fdb1a170b57ffd7174b3c3042cc86b7fe91 (patch) | |
| tree | aa3b27019254450634a4fea8583e7cc70d7b7190 /src/liballoc/lib.rs | |
| parent | 6b74503aa4f2fb4035d9adef9391e9b9658c57ad (diff) | |
| parent | 668d63132e23999f5a74fe65c8c0590a4d9ca215 (diff) | |
| download | rust-099b9fdb1a170b57ffd7174b3c3042cc86b7fe91.tar.gz rust-099b9fdb1a170b57ffd7174b3c3042cc86b7fe91.zip | |
Auto merge of #36030 - Manishearth:rollup, r=Manishearth
Rollup of 7 pull requests - Successful merges: #35124, #35877, #35953, #36002, #36004, #36005, #36014 - Failed merges:
Diffstat (limited to 'src/liballoc/lib.rs')
| -rw-r--r-- | src/liballoc/lib.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/liballoc/lib.rs b/src/liballoc/lib.rs index d9fd2d92710..c6453da3f46 100644 --- a/src/liballoc/lib.rs +++ b/src/liballoc/lib.rs @@ -91,7 +91,7 @@ #![cfg_attr(stage0, feature(unsafe_no_drop_flag))] #![feature(unsize)] -#![cfg_attr(not(test), feature(fused, raw, fn_traits, placement_new_protocol))] +#![cfg_attr(not(test), feature(fused, fn_traits, placement_new_protocol))] #![cfg_attr(test, feature(test, box_heap))] // Allow testing this library |