diff options
| author | bors <bors@rust-lang.org> | 2020-04-26 15:48:58 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2020-04-26 15:48:58 +0000 |
| commit | 7f3b3df9e2f2efe3434b4f6fc76462d2c8ad332f (patch) | |
| tree | 473644e3095ec29d92b0c68880f49599c402cbfa /src/libstd | |
| parent | ec1f28f9614292c36b371d3758afffdd52cb9786 (diff) | |
| parent | aa9dc6952235a58d4c37b63bed15992f5225fbf0 (diff) | |
| download | rust-7f3b3df9e2f2efe3434b4f6fc76462d2c8ad332f.tar.gz rust-7f3b3df9e2f2efe3434b4f6fc76462d2c8ad332f.zip | |
Auto merge of #71579 - Dylan-DPC:rollup-h9om2g3, r=Dylan-DPC
Rollup of 5 pull requests Successful merges: - #71490 (Cleanup and document `-C relocation-model`) - #71562 (fix more clippy warnings) - #71571 (Fix since attribute for nonzero_bitor impl's) - #71574 (proc_macro: Fix since attributes for new Span methods) - #71575 (Fix stable(since) attribute for BTreeMap::remove_entry) Failed merges: r? @ghost
Diffstat (limited to 'src/libstd')
| -rw-r--r-- | src/libstd/sync/mpsc/stream.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libstd/sync/mpsc/stream.rs b/src/libstd/sync/mpsc/stream.rs index 26b4faebd86..9f7c1af8951 100644 --- a/src/libstd/sync/mpsc/stream.rs +++ b/src/libstd/sync/mpsc/stream.rs @@ -329,7 +329,7 @@ impl<T> Packet<T> { ); cnt != DISCONNECTED && cnt != steals } { - while let Some(_) = self.queue.pop() { + while self.queue.pop().is_some() { steals += 1; } } |