diff options
| author | bors <bors@rust-lang.org> | 2015-05-01 19:17:45 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2015-05-01 19:17:45 +0000 |
| commit | f3345cb0a70cdac95e126b611b355ab4d36ca3df (patch) | |
| tree | a07754fae7b803df9e691e0ebd37e4e3d6b21a0e /src/libcore | |
| parent | 613109db1b7ee95cc55d2e9710c1d54836504271 (diff) | |
| parent | a23d7e10c7187ba2b0f2069a9905994592fa1108 (diff) | |
| download | rust-f3345cb0a70cdac95e126b611b355ab4d36ca3df.tar.gz rust-f3345cb0a70cdac95e126b611b355ab4d36ca3df.zip | |
Auto merge of #24778 - nagisa:managed-removal, r=huonw
Leftovers from @-pointer times, I guess.
Diffstat (limited to 'src/libcore')
| -rw-r--r-- | src/libcore/intrinsics.rs | 3 | ||||
| -rw-r--r-- | src/libcore/marker.rs | 10 |
2 files changed, 0 insertions, 13 deletions
diff --git a/src/libcore/intrinsics.rs b/src/libcore/intrinsics.rs index ac43055a7c4..101381e2c71 100644 --- a/src/libcore/intrinsics.rs +++ b/src/libcore/intrinsics.rs @@ -267,9 +267,6 @@ extern "rust-intrinsic" { /// `Copy`, then may return `true` or `false`. pub fn needs_drop<T>() -> bool; - /// Returns `true` if a type is managed (will be allocated on the local heap) - pub fn owns_managed<T>() -> bool; - /// Calculates the offset from a pointer. /// /// This is implemented as an intrinsic to avoid converting to and from an diff --git a/src/libcore/marker.rs b/src/libcore/marker.rs index e8c7045141d..04839b12ac8 100644 --- a/src/libcore/marker.rs +++ b/src/libcore/marker.rs @@ -43,7 +43,6 @@ unsafe impl Send for .. { } impl<T> !Send for *const T { } impl<T> !Send for *mut T { } -impl !Send for Managed { } /// Types with a constant size known at compile-time. #[stable(feature = "rust1", since = "1.0.0")] @@ -212,7 +211,6 @@ unsafe impl Sync for .. { } impl<T> !Sync for *const T { } impl<T> !Sync for *mut T { } -impl !Sync for Managed { } /// A type which is considered "not POD", meaning that it is not /// implicitly copyable. This is typically embedded in other types to @@ -223,14 +221,6 @@ impl !Sync for Managed { } #[derive(Clone, PartialEq, Eq, PartialOrd, Ord)] pub struct NoCopy; -/// A type which is considered managed by the GC. This is typically -/// embedded in other types. -#[unstable(feature = "core", - reason = "likely to change with new variance strategy")] -#[lang="managed_bound"] -#[derive(Clone, PartialEq, Eq, PartialOrd, Ord)] -pub struct Managed; - macro_rules! impls{ ($t: ident) => ( impl<T:?Sized> Hash for $t<T> { |