rollup merge of #22459: alexcrichton/feature-names

Conflicts:
	src/rustbook/main.rs
This commit is contained in:
Alex Crichton 2015-02-17 15:16:22 -08:00
commit d8ba8b00a7
18 changed files with 36 additions and 37 deletions

View file

@ -29,8 +29,8 @@ Core encoding and decoding interfaces.
#![feature(collections)]
#![feature(core)]
#![feature(int_uint)]
#![feature(io)]
#![feature(path)]
#![feature(old_io)]
#![feature(old_path)]
#![feature(hash)]
#![feature(rustc_private)]
#![feature(staged_api)]