diff options
| author | Alex Crichton <alex@alexcrichton.com> | 2015-03-31 16:20:09 -0700 |
|---|---|---|
| committer | Alex Crichton <alex@alexcrichton.com> | 2015-03-31 17:39:24 -0700 |
| commit | 72f59732d7974767650abfc58f8287212e5a1fba (patch) | |
| tree | fbb20c45e460c82a79f86ded0fa59c0ada501c62 /src/liballoc | |
| parent | 50b3ecf3bcc2e39a7a42e7f4b49f19398d5cc681 (diff) | |
| download | rust-72f59732d7974767650abfc58f8287212e5a1fba.tar.gz rust-72f59732d7974767650abfc58f8287212e5a1fba.zip | |
Test fixes and rebase conflicts, round 3
Diffstat (limited to 'src/liballoc')
| -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 a880ba5cfe4..b92dfa9117e 100644 --- a/src/liballoc/lib.rs +++ b/src/liballoc/lib.rs @@ -78,7 +78,6 @@ #![feature(unsafe_no_drop_flag, filling_drop)] #![feature(core)] #![feature(unique)] -#![feature(convert)] #![cfg_attr(test, feature(test, alloc, rustc_private))] #![cfg_attr(all(not(feature = "external_funcs"), not(feature = "external_crate")), feature(libc))] |