diff options
| author | Alex Crichton <alex@alexcrichton.com> | 2015-04-01 16:34:15 -0700 |
|---|---|---|
| committer | Alex Crichton <alex@alexcrichton.com> | 2015-04-01 18:38:24 -0700 |
| commit | 57f5ac948aeb296b99785a82ffc49fafc291aad9 (patch) | |
| tree | 087bef87d54db5cf3593617998e822168053c3ce /src/libstd/sync/mpsc/mpsc_queue.rs | |
| parent | d49b67e255db86a5df952b33f4140150fc12bf4d (diff) | |
| download | rust-57f5ac948aeb296b99785a82ffc49fafc291aad9.tar.gz rust-57f5ac948aeb296b99785a82ffc49fafc291aad9.zip | |
Test fixes and rebase conflicts, round 2
Diffstat (limited to 'src/libstd/sync/mpsc/mpsc_queue.rs')
| -rw-r--r-- | src/libstd/sync/mpsc/mpsc_queue.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libstd/sync/mpsc/mpsc_queue.rs b/src/libstd/sync/mpsc/mpsc_queue.rs index 7866a85dc8f..9b6c8f4dd97 100644 --- a/src/libstd/sync/mpsc/mpsc_queue.rs +++ b/src/libstd/sync/mpsc/mpsc_queue.rs @@ -72,12 +72,12 @@ struct Node<T> { /// The multi-producer single-consumer structure. This is not cloneable, but it /// may be safely shared so long as it is guaranteed that there is only one /// popper at a time (many pushers are allowed). -pub struct Queue<T: Send> { +pub struct Queue<T> { head: AtomicPtr<Node<T>>, tail: UnsafeCell<*mut Node<T>>, } -unsafe impl<T:Send> Send for Queue<T> { } +unsafe impl<T: Send> Send for Queue<T> { } unsafe impl<T: Send> Sync for Queue<T> { } impl<T> Node<T> { |