chris/ruwuma
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use mem::take instead of mem::replace where applicable

Browse Source
This commit is contained in:
Jonas Platte 2021-04-05 12:08:29 +02:00
parent 679508f831
commit 1dd6a3870a
No known key found for this signature in database
GPG Key ID: CC154DE0E30B7C67
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ruma-api-macros/src/api/parse.rs
View File

@ -84,7 +84,7 @@ impl Parse for Request {
let mut field_kind = None; let mut field_kind = None;
let mut header = None; let mut header = None;
for attr in mem::replace(&mut field.attrs, Vec::new()) { for attr in mem::take(&mut field.attrs) {
let meta = match Meta::from_attribute(&attr)? { let meta = match Meta::from_attribute(&attr)? {
Some(m) => m, Some(m) => m,
None => { None => {
@ -231,7 +231,7 @@ impl Parse for Response {
let mut field_kind = None; let mut field_kind = None;
let mut header = None; let mut header = None;
for attr in mem::replace(&mut field.attrs, Vec::new()) { for attr in mem::take(&mut field.attrs) {
let meta = match Meta::from_attribute(&attr)? { let meta = match Meta::from_attribute(&attr)? {
Some(m) => m, Some(m) => m,
None => { None => {

4
ruma-signatures/src/functions.rs
View File

@ -721,7 +721,7 @@ pub fn redact(
_ => return Err(Error::new("field `content` in JSON value must be a JSON object")), _ => return Err(Error::new("field `content` in JSON value must be a JSON object")),
}; };
let mut old_content = mem::replace(content, BTreeMap::new()); let mut old_content = mem::take(content);
for &key in allowed_content_keys { for &key in allowed_content_keys {
if let Some(value) = old_content.remove(key) { if let Some(value) = old_content.remove(key) {
@ -730,7 +730,7 @@ pub fn redact(
} }
} }
let mut old_event = mem::replace(&mut event, BTreeMap::new()); let mut old_event = mem::take(&mut event);
for &key in ALLOWED_KEYS { for &key in ALLOWED_KEYS {
if let Some(value) = old_event.remove(key) { if let Some(value) = old_event.remove(key) {