actix/actix-web
1
0
Fork 0
mirror of https://github.com/fafhrd91/actix-web synced 2024-11-24 00:21:08 +01:00
Code Issues Releases Wiki Activity

use mem::replace instead of mem::take rust 1.40+

Browse Source
This commit is contained in:
Maksym Vorobiov 2020-02-16 19:48:09 +02:00 committed by Yuki Okushi
parent 78749a4b7e
commit 0a86907dd2
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
actix-http/src/h1/dispatcher.rs
View File

@ -780,10 +780,10 @@ where
let inner_p = inner.as_mut().project(); let inner_p = inner.as_mut().project();
let mut parts = FramedParts::with_read_buf( let mut parts = FramedParts::with_read_buf(
inner_p.io.take().unwrap(), inner_p.io.take().unwrap(),
std::mem::take(inner_p.codec), std::mem::replace(inner_p.codec, Codec::default()),
std::mem::take(inner_p.read_buf), std::mem::replace(inner_p.read_buf, BytesMut::default()),
); );
parts.write_buf = std::mem::take(inner_p.write_buf); parts.write_buf = std::mem::replace(inner_p.write_buf, BytesMut::default());
let framed = Framed::from_parts(parts); let framed = Framed::from_parts(parts);
let upgrade = inner_p.upgrade.take().unwrap().call((req, framed)); let upgrade = inner_p.upgrade.take().unwrap().call((req, framed));
self.as_mut().project().inner.set(DispatcherState::Upgrade(upgrade)); self.as_mut().project().inner.set(DispatcherState::Upgrade(upgrade));