diff options
| author | Tamir Duberstein <tamird@gmail.com> | 2015-04-27 14:10:49 -0700 |
|---|---|---|
| committer | Tamir Duberstein <tamird@gmail.com> | 2015-04-28 17:23:45 -0700 |
| commit | 69abc12b0044d641e714bdd73a299cfa4136b7b8 (patch) | |
| tree | b434c9c4a9b8260632c8a6c20823c95a8f5a02e7 /src/libstd/thread | |
| parent | 8871c17b76a1e0ab36ce2bb51008b53f596e5b3c (diff) | |
| download | rust-69abc12b0044d641e714bdd73a299cfa4136b7b8.tar.gz rust-69abc12b0044d641e714bdd73a299cfa4136b7b8.zip | |
Register new snapshots
Diffstat (limited to 'src/libstd/thread')
| -rw-r--r-- | src/libstd/thread/mod.rs | 1 | ||||
| -rw-r--r-- | src/libstd/thread/scoped_tls.rs | 3 |
2 files changed, 1 insertions, 3 deletions
diff --git a/src/libstd/thread/mod.rs b/src/libstd/thread/mod.rs index ce531fb1381..ae480380f95 100644 --- a/src/libstd/thread/mod.rs +++ b/src/libstd/thread/mod.rs @@ -700,7 +700,6 @@ impl<'a, T: Send + 'a> JoinGuard<'a, T> { } } -#[unsafe_destructor] #[unstable(feature = "scoped", reason = "memory unsafe if destructor is avoided, see #24292")] impl<'a, T: Send + 'a> Drop for JoinGuard<'a, T> { diff --git a/src/libstd/thread/scoped_tls.rs b/src/libstd/thread/scoped_tls.rs index 9c0b4a5d833..35684a1f390 100644 --- a/src/libstd/thread/scoped_tls.rs +++ b/src/libstd/thread/scoped_tls.rs @@ -171,8 +171,7 @@ impl<T> ScopedKey<T> { key: &'a __impl::KeyInner<T>, val: *mut T, } - #[unsafe_destructor] - impl<'a, T> Drop for Reset<'a, T> { + impl<'a, T> Drop for Reset<'a, T> { fn drop(&mut self) { unsafe { self.key.set(self.val) } } |