rollup merge of #20607: nrc/kinds

Conflicts:
	src/libcore/array.rs
	src/libcore/cell.rs
	src/libcore/prelude.rs
	src/libstd/path/posix.rs
	src/libstd/prelude/v1.rs
	src/test/compile-fail/dst-sized-trait-param.rs
This commit is contained in:
Alex Crichton
2015-01-06 15:34:10 -08:00
156 changed files with 580 additions and 554 deletions

View File

@@ -107,7 +107,7 @@ pub mod ptr;
/* Core language traits */
pub mod kinds;
pub mod marker;
pub mod ops;
pub mod cmp;
pub mod clone;
@@ -146,7 +146,9 @@ mod core {
mod std {
pub use clone;
pub use cmp;
pub use kinds;
#[cfg(stage0)]
pub use marker as kinds;
pub use marker;
pub use option;
pub use fmt;
pub use hash;