user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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/liballoc/arc.rs
View file

@ -74,7 +74,7 @@ use core::clone::Clone;
use core::fmt::{self, Show};
use core::cmp::{Eq, Ord, PartialEq, PartialOrd, Ordering};
use core::default::Default;
use core::kinds::{Sync, Send};
use core::marker::{Sync, Send};
use core::mem::{min_align_of, size_of, drop};
use core::mem;
use core::nonzero::NonZero;