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

4
src/libstd/thread_local/mod.rs
View file

@ -345,7 +345,7 @@ mod imp {
pub dtor_running: UnsafeCell<bool>, // should be Cell
}
unsafe impl<T> ::kinds::Sync for Key<T> { }
unsafe impl<T> ::marker::Sync for Key<T> { }
#[doc(hidden)]
impl<T> Key<T> {
@ -471,7 +471,7 @@ mod imp {
pub os: OsStaticKey,
}
unsafe impl<T> ::kinds::Sync for Key<T> { }
unsafe impl<T> ::marker::Sync for Key<T> { }
struct Value<T: 'static> {
key: &'static Key<T>,

8
src/libstd/thread_local/scoped.rs
View file

@ -108,7 +108,7 @@ macro_rules! __scoped_thread_local_inner {
const _INIT: __Key<$t> = __Key {
inner: ::std::thread_local::scoped::__impl::KeyInner {
inner: ::std::thread_local::scoped::__impl::OS_INIT,
marker: ::std::kinds::marker::InvariantType,
marker: ::std::marker::InvariantType,
}
};
@ -211,7 +211,7 @@ mod imp {
#[doc(hidden)]
pub struct KeyInner<T> { pub inner: UnsafeCell<*mut T> }
unsafe impl<T> ::kinds::Sync for KeyInner<T> { }
unsafe impl<T> ::marker::Sync for KeyInner<T> { }
#[doc(hidden)]
impl<T> KeyInner<T> {
@ -224,7 +224,7 @@ mod imp {
#[cfg(any(windows, target_os = "android", target_os = "ios", target_arch = "aarch64"))]
mod imp {
use kinds::marker;
use marker;
use sys_common::thread_local::StaticKey as OsStaticKey;
#[doc(hidden)]
@ -233,7 +233,7 @@ mod imp {
pub marker: marker::InvariantType<T>,
}
unsafe impl<T> ::kinds::Sync for KeyInner<T> { }
unsafe impl<T> ::marker::Sync for KeyInner<T> { }
#[doc(hidden)]
impl<T> KeyInner<T> {