diff options
| author | bors <bors@rust-lang.org> | 2016-09-28 21:55:15 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-09-28 21:55:15 -0700 |
| commit | 91f34c0c70746f5c938d25d02a8a66b41240b2f0 (patch) | |
| tree | 5181cf125d06fbb10f8a3d2271003dce4a9f8b62 /src/liballoc/lib.rs | |
| parent | eee2d04d877fe909309c39b6bdf711dc586d0a1e (diff) | |
| parent | f12f9504b33b3e98952bc2bbca41fe0b81fac6fe (diff) | |
| download | rust-91f34c0c70746f5c938d25d02a8a66b41240b2f0.tar.gz rust-91f34c0c70746f5c938d25d02a8a66b41240b2f0.zip | |
Auto merge of #36818 - jonathandturner:rollup, r=jonathandturner
Rollup of 12 pull requests - Successful merges: #35286, #35892, #36460, #36704, #36741, #36760, #36787, #36789, #36794, #36803, #36811, #36813 - Failed merges:
Diffstat (limited to 'src/liballoc/lib.rs')
| -rw-r--r-- | src/liballoc/lib.rs | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/liballoc/lib.rs b/src/liballoc/lib.rs index c6453da3f46..31491106d97 100644 --- a/src/liballoc/lib.rs +++ b/src/liballoc/lib.rs @@ -88,7 +88,6 @@ #![feature(staged_api)] #![feature(unboxed_closures)] #![feature(unique)] -#![cfg_attr(stage0, feature(unsafe_no_drop_flag))] #![feature(unsize)] #![cfg_attr(not(test), feature(fused, fn_traits, placement_new_protocol))] |