bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

rollup merge of #20607: nrc/kinds

Browse source 
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
commit 771fe9026a
156 changed files with 580 additions and 554 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/libstd/path/mod.rs
View file

@ -61,7 +61,7 @@
#![experimental]
use core::kinds::Sized;
use core::marker::Sized;
use ffi::CString;
use clone::Clone;
use fmt;

4
src/libstd/path/posix.rs
View file

@ -17,8 +17,8 @@ use hash;
use io::Writer;
use iter::{AdditiveIterator, Extend};
use iter::{Iterator, IteratorExt, Map};
use prelude::v1::Index;
use kinds::Sized;
use ops::Index;
use marker::Sized;
use option::Option::{self, Some, None};
use slice::{AsSlice, Split, SliceExt, SliceConcatExt};
use str::{self, FromStr, StrExt};