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
18 changed files with 36 additions and 37 deletions

View File

@@ -238,7 +238,7 @@
//! concerned with error handling; instead its caller is responsible for
//! responding to errors that may occur while attempting to read the numbers.
#![unstable(feature = "io")]
#![unstable(feature = "old_io")]
#![deny(unused_must_use)]
pub use self::SeekStyle::*;