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

refactor: remove slicing from remove_bottom_quote

Browse Source
This commit is contained in:
link2xt
2024-11-18 20:00:48 +00:00
committed by l
parent d3d2509273
commit d0b945d4ee
1 changed files with 15 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/simplify.rs
View File

@@ -174,7 +174,6 @@ fn skip_forward_header<'a>(lines: &'a [&str]) -> (&'a [&'a str], bool) {
} }
} }
#[allow(clippy::indexing_slicing)]
fn remove_bottom_quote<'a>(lines: &'a [&str]) -> (&'a [&'a str], Option<String>) { fn remove_bottom_quote<'a>(lines: &'a [&str]) -> (&'a [&'a str], Option<String>) {
let mut first_quoted_line = lines.len(); let mut first_quoted_line = lines.len();
let mut last_quoted_line = None; let mut last_quoted_line = None;
@@ -189,24 +188,31 @@ fn remove_bottom_quote<'a>(lines: &'a [&str]) -> (&'a [&'a str], Option<String>)
} }
} }
if let Some(mut l_last) = last_quoted_line { if let Some(mut l_last) = last_quoted_line {
let quoted_text = lines[l_last..first_quoted_line] let quoted_text = lines
.iter() .iter()
.take(first_quoted_line)
.skip(l_last)
.map(|s| { .map(|s| {
s.strip_prefix('>') s.strip_prefix('>')
.map_or(*s, |u| u.strip_prefix(' ').unwrap_or(u)) .map_or(*s, |u| u.strip_prefix(' ').unwrap_or(u))
}) })
.collect::<Vec<&str>>() .collect::<Vec<&str>>()
.join("\n"); .join("\n");
if l_last > 1 && is_empty_line(lines[l_last - 1]) { if l_last > 1 {
if let Some(line) = lines.get(l_last - 1) {
if is_empty_line(line) {
l_last -= 1 l_last -= 1
} }
}
}
if l_last > 1 { if l_last > 1 {
let line = lines[l_last - 1]; if let Some(line) = lines.get(l_last - 1) {
if is_quoted_headline(line) { if is_quoted_headline(line) {
l_last -= 1 l_last -= 1
} }
} }
(&lines[..l_last], Some(quoted_text)) }
(lines.get(..l_last).unwrap_or(lines), Some(quoted_text))
} else { } else {
(lines, None) (lines, None)
} }