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

refactor: remove indexing/slicing from remove_message_footer

Browse Source
This commit is contained in:
link2xt
2024-11-18 17:15:07 +00:00
committed by l
parent 7b1fa50fb0
commit 442e2787c6
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/simplify.rs
View File

@@ -1,4 +1,5 @@
//! # Simplify incoming plaintext. //! # Simplify incoming plaintext.
use crate::tools::IsNoneOrEmpty;
/// Protects lines starting with `--` against being treated as a footer. /// Protects lines starting with `--` against being treated as a footer.
/// for that, we insert a ZERO WIDTH SPACE (ZWSP, 0x200B); /// for that, we insert a ZERO WIDTH SPACE (ZWSP, 0x200B);
@@ -20,7 +21,6 @@ pub fn escape_message_footer_marks(text: &str) -> String {
/// Returns `(lines, footer_lines)` tuple; /// Returns `(lines, footer_lines)` tuple;
/// `footer_lines` is set to `Some` if the footer was actually removed from `lines` /// `footer_lines` is set to `Some` if the footer was actually removed from `lines`
/// (which is equal to the input array otherwise). /// (which is equal to the input array otherwise).
#[allow(clippy::indexing_slicing)]
pub(crate) fn remove_message_footer<'a>( pub(crate) fn remove_message_footer<'a>(
lines: &'a [&str], lines: &'a [&str],
) -> (&'a [&'a str], Option<&'a [&'a str]>) { ) -> (&'a [&'a str], Option<&'a [&'a str]>) {
@@ -28,14 +28,13 @@ pub(crate) fn remove_message_footer<'a>(
for (ix, &line) in lines.iter().enumerate() { for (ix, &line) in lines.iter().enumerate() {
match line { match line {
// some providers encode `-- ` to `-- =20` which results in `-- ` // some providers encode `-- ` to `-- =20` which results in `-- `
"-- " | "-- " => return (&lines[..ix], lines.get(ix + 1..)), "-- " | "-- " => return (lines.get(..ix).unwrap_or(lines), lines.get(ix + 1..)),
// some providers encode `-- ` to `=2D-` which results in only `--`; // some providers encode `-- ` to `=2D-` which results in only `--`;
// use that only when no other footer is found // use that only when no other footer is found
// and if the line before is empty and the line after is not empty // and if the line before is empty and the line after is not empty
"--" => { "--" => {
if (ix == 0 || lines[ix - 1].is_empty()) if (ix == 0 || lines.get(ix.saturating_sub(1)).is_none_or_empty())
&& ix != lines.len() - 1 && !lines.get(ix + 1).is_none_or_empty()
&& !lines[ix + 1].is_empty()
{ {
nearly_standard_footer = Some(ix); nearly_standard_footer = Some(ix);
} }
@@ -44,7 +43,7 @@ pub(crate) fn remove_message_footer<'a>(
} }
} }
if let Some(ix) = nearly_standard_footer { if let Some(ix) = nearly_standard_footer {
return (&lines[..ix], lines.get(ix + 1..)); return (lines.get(..ix).unwrap_or(lines), lines.get(ix + 1..));
} }
(lines, None) (lines, None)
} }