rollup merge of #22459: alexcrichton/feature-names

Conflicts:
	src/rustbook/main.rs

diff --cc src/librustc_driver/lib.rs
Simple merge

diff --cc src/librustc_llvm/lib.rs
Simple merge

diff --cc src/libstd/old_io/mod.rs
Simple merge

diff --cc src/libterm/lib.rs
index 276e2f3ca38b6bded9e573425c849b75ec0a5d75,81534dbe4c4c2734b18c660219a45ee8f2e23e2e..6cd96769ed2f07d795e1e4c4464fe6f5cd0b9750
--- 1/src/libterm/lib.rs
--- 2/src/libterm/lib.rs
+++ b/src/libterm/lib.rs
@@@ -54,10 -54,11 +54,10 @@@
  #![feature(box_syntax)]
  #![feature(collections)]
  #![feature(int_uint)]
- #![feature(io)]
- #![feature(path)]
+ #![feature(old_io)]
+ #![feature(old_path)]
  #![feature(rustc_private)]
  #![feature(staged_api)]
 -#![feature(std_misc)]
  #![feature(unicode)]
  #![feature(env)]
  #![cfg_attr(windows, feature(libc))]

diff --cc src/rustbook/main.rs
index cfd4379497a05e4de91f29cfc1a206b4abf307ee,c0e9cac2813d8945cca21e6577176ef326de34b2..ace57f0ac2c0b9351e6df4860955697cedd209b4
--- 1/src/rustbook/main.rs
--- 2/src/rustbook/main.rs
+++ b/src/rustbook/main.rs
@@@ -11,10 -11,9 +11,10 @@@
  #![feature(box_syntax)]
  #![feature(collections)]
  #![feature(core)]
- #![feature(io)]
+ #![feature(old_io)]
  #![feature(os)]
- #![feature(path)]
 +#![feature(env)]
+ #![feature(old_path)]
  #![feature(rustdoc)]
  
  extern crate rustdoc;