diff options
| author | bors <bors@rust-lang.org> | 2020-03-08 05:27:21 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2020-03-08 05:27:21 +0000 |
| commit | f943349eafaa75a60c05b0c84dcdb771d0eae8c9 (patch) | |
| tree | 9e2d6e08dc1aff13d98144034e7db7080e6eb872 /src/libstd/sync/mpsc/spsc_queue.rs | |
| parent | 823ff8cf1397a5772b1f6954b60576202bf91836 (diff) | |
| parent | 8ee7278fca2cb137c81c8a12ca46c5df1838c2f3 (diff) | |
| download | rust-f943349eafaa75a60c05b0c84dcdb771d0eae8c9.tar.gz rust-f943349eafaa75a60c05b0c84dcdb771d0eae8c9.zip | |
Auto merge of #69804 - Centril:rollup-u86dc1g, r=Centril
Rollup of 8 pull requests Successful merges: - #69667 (Remove the `no_debug` feature) - #69687 (resolve, inconsistent binding mode: tweak wording) - #69708 (On mismatched delimiters, only point at empty blocks that are in the same line) - #69765 (reduce test size for Miri) - #69773 (fix various typos) - #69787 (mir::Local is Copy we can pass it by value in these cases) - #69794 (Add `Layout::dangling()` to return a well-aligned `NonNull<u8>`) - #69797 (Correct version that relaxed orphan rules) Failed merges: r? @ghost
Diffstat (limited to 'src/libstd/sync/mpsc/spsc_queue.rs')
| -rw-r--r-- | src/libstd/sync/mpsc/spsc_queue.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libstd/sync/mpsc/spsc_queue.rs b/src/libstd/sync/mpsc/spsc_queue.rs index c51aa7619db..0274268f69f 100644 --- a/src/libstd/sync/mpsc/spsc_queue.rs +++ b/src/libstd/sync/mpsc/spsc_queue.rs @@ -40,7 +40,7 @@ struct Consumer<T, Addition> { tail: UnsafeCell<*mut Node<T>>, // where to pop from tail_prev: AtomicPtr<Node<T>>, // where to pop from cache_bound: usize, // maximum cache size - cached_nodes: AtomicUsize, // number of nodes marked as cachable + cached_nodes: AtomicUsize, // number of nodes marked as cacheable addition: Addition, } |