diff options
| author | Alex Crichton <alex@alexcrichton.com> | 2015-03-31 16:18:55 -0700 |
|---|---|---|
| committer | Alex Crichton <alex@alexcrichton.com> | 2015-03-31 16:18:55 -0700 |
| commit | 50b3ecf3bcc2e39a7a42e7f4b49f19398d5cc681 (patch) | |
| tree | 0546f83f5625d11fc4d5d9b2ad215a4ac3ce4778 /src/liballoc/lib.rs | |
| parent | 85e997adfffa5e8511ff31710649038216028832 (diff) | |
| parent | ac77392f8ab1c201b0c927f6a2d30b632b95acda (diff) | |
| download | rust-50b3ecf3bcc2e39a7a42e7f4b49f19398d5cc681.tar.gz rust-50b3ecf3bcc2e39a7a42e7f4b49f19398d5cc681.zip | |
rollup merge of #23919: alexcrichton/stabilize-io-error
Conflicts: src/libstd/fs/tempdir.rs src/libstd/io/error.rs
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 b92dfa9117e..a880ba5cfe4 100644 --- a/src/liballoc/lib.rs +++ b/src/liballoc/lib.rs @@ -78,6 +78,7 @@ #![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))] |