diff options
| author | bors <bors@rust-lang.org> | 2015-05-25 23:02:52 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2015-05-25 23:02:52 +0000 |
| commit | 7cb9914fceaeaa6a39add43d3da15bb6e1d191f6 (patch) | |
| tree | fc885d585246974c4c95ff010b383b330fbba108 /src/libstd | |
| parent | cc156c2f3819e8818c66e5f5d0bb143739e3bbb0 (diff) | |
| parent | d416fc1d40e39661153b2183726f7e71f51d24e3 (diff) | |
| download | rust-7cb9914fceaeaa6a39add43d3da15bb6e1d191f6.tar.gz rust-7cb9914fceaeaa6a39add43d3da15bb6e1d191f6.zip | |
Auto merge of #25767 - mystor:patch-1, r=Gankro
By the same logic that `mem::forget` is safe, `boxed::into_raw` is actually a safe function. Fixes #25755.
Diffstat (limited to 'src/libstd')
| -rw-r--r-- | src/libstd/sync/mpsc/spsc_queue.rs | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/src/libstd/sync/mpsc/spsc_queue.rs b/src/libstd/sync/mpsc/spsc_queue.rs index b72da91c0a0..a0ed52d4d3c 100644 --- a/src/libstd/sync/mpsc/spsc_queue.rs +++ b/src/libstd/sync/mpsc/spsc_queue.rs @@ -80,12 +80,10 @@ unsafe impl<T: Send> Sync for Queue<T> { } impl<T> Node<T> { fn new() -> *mut Node<T> { - unsafe { - boxed::into_raw(box Node { - value: None, - next: AtomicPtr::new(ptr::null_mut::<Node<T>>()), - }) - } + boxed::into_raw(box Node { + value: None, + next: AtomicPtr::new(ptr::null_mut::<Node<T>>()), + }) } } |
