diff options
| author | Christian Poveda <christianpoveda@protonmail.com> | 2019-07-04 01:45:29 -0500 |
|---|---|---|
| committer | Christian Poveda <christianpoveda@protonmail.com> | 2019-07-04 01:45:29 -0500 |
| commit | e45bbaf48c9fb0439426967009d837f0fe4f74ce (patch) | |
| tree | a887380eed192d6ea9b2f124574932bcc1297c34 /src/libstd/sync | |
| parent | e32b8eb00a94274e680d1ae63c429d5b7db65e99 (diff) | |
| parent | b43eb4235ac43c822d903ad26ed806f34cc1a14a (diff) | |
| download | rust-e45bbaf48c9fb0439426967009d837f0fe4f74ce.tar.gz rust-e45bbaf48c9fb0439426967009d837f0fe4f74ce.zip | |
Fix merge conflicts
Diffstat (limited to 'src/libstd/sync')
| -rw-r--r-- | src/libstd/sync/mpsc/sync.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libstd/sync/mpsc/sync.rs b/src/libstd/sync/mpsc/sync.rs index 3c4f8e077c9..f8fcd3ff5a5 100644 --- a/src/libstd/sync/mpsc/sync.rs +++ b/src/libstd/sync/mpsc/sync.rs @@ -383,7 +383,7 @@ impl<T> Packet<T> { // needs to be careful to destroy the data *outside* of the lock to // prevent deadlock. let _data = if guard.cap != 0 { - mem::replace(&mut guard.buf.buf, Vec::new()) + mem::take(&mut guard.buf.buf) } else { Vec::new() }; |