Mirrors/chatmail-core
1
0
Fork 0
mirror of https://github.com/chatmail/core.git synced 2026-05-03 21:36:29 +03:00
Code Issues Packages Projects Releases Wiki Activity

refactor: use HashMap::extract_if() stabilized in Rust 1.88.0

Browse Source
This commit is contained in:
link2xt
2025-11-17 13:07:44 +00:00
committed by l
parent 16bd87c78f
commit 72788daca0
1 changed files with 10 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/mimeparser.rs
View File

@@ -273,12 +273,11 @@ impl MimeMessage {
&mut chat_disposition_notification_to,
&mail,
);
headers.retain(|k, _| {
!is_hidden(k) || {
headers_removed.insert(k.to_string());
false
}
});
headers_removed.extend(
headers
.extract_if(|k, _v| is_hidden(k))
.map(|(k, _v)| k.to_string()),
);
// Parse hidden headers.
let mimetype = mail.ctype.mimetype.parse::<Mime>()?;
@@ -1680,12 +1679,11 @@ impl MimeMessage {
// See <https://www.rfc-editor.org/rfc/rfc9788.html>.
let has_header_protection = part.ctype.params.contains_key("hp");
headers.retain(|k, _| {
!(has_header_protection || is_protected(k)) || {
headers_removed.insert(k.to_string());
false
}
});
headers_removed.extend(
headers
.extract_if(|k, _v| has_header_protection || is_protected(k))
.map(|(k, _v)| k.to_string()),
);
for field in fields {
// lowercasing all headers is technically not correct, but makes things work better
let key = field.get_key().to_lowercase();