diff options
| author | Alex Crichton <alex@alexcrichton.com> | 2015-02-17 15:16:22 -0800 |
|---|---|---|
| committer | Alex Crichton <alex@alexcrichton.com> | 2015-02-17 17:26:59 -0800 |
| commit | d8ba8b00a7be7c9aba8fb5a6c0174e526c5a3d4d (patch) | |
| tree | e5174e340d1249a638ed4b75fa52d22309bf8e66 /src/rustbook | |
| parent | c166fd3041208bda4a55e1fcaaf14a38cc3d6158 (diff) | |
| parent | a2ebb24ee6cc76791ef834cb2d17ecac95756499 (diff) | |
| download | rust-d8ba8b00a7be7c9aba8fb5a6c0174e526c5a3d4d.tar.gz rust-d8ba8b00a7be7c9aba8fb5a6c0174e526c5a3d4d.zip | |
rollup merge of #22459: alexcrichton/feature-names
Conflicts: src/rustbook/main.rs
Diffstat (limited to 'src/rustbook')
| -rw-r--r-- | src/rustbook/main.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/rustbook/main.rs b/src/rustbook/main.rs index cfd4379497a..ace57f0ac2c 100644 --- a/src/rustbook/main.rs +++ b/src/rustbook/main.rs @@ -11,10 +11,10 @@ #![feature(box_syntax)] #![feature(collections)] #![feature(core)] -#![feature(io)] +#![feature(old_io)] #![feature(os)] #![feature(env)] -#![feature(path)] +#![feature(old_path)] #![feature(rustdoc)] extern crate rustdoc; |