valknar/llmx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

chore: clippy on redundant closure (#4058)

Browse Source 
Add redundant closure clippy rules and let Codex fix it by minimising
FQP
This commit is contained in:
jif-oai
2025-09-22 20:30:16 +01:00
committed by GitHub
parent c75920a071
commit be366a31ab
43 changed files with 97 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
codex-rs/tui/src/bottom_pane/chat_composer.rs
View File

@@ -421,7 +421,7 @@ impl ChatComposer {
// Capture any needed data from popup before clearing it.
let prompt_content = match sel {
CommandItem::UserPrompt(idx) => {
popup.prompt_content(idx).map(|s| s.to_string())
popup.prompt_content(idx).map(str::to_string)
}
_ => None,
};
@@ -550,7 +550,7 @@ impl ChatComposer {
let format_label = match Path::new(&sel_path)
.extension()
.and_then(|e| e.to_str())
.map(|s| s.to_ascii_lowercase())
.map(str::to_ascii_lowercase)
{
Some(ext) if ext == "png" => "PNG",
Some(ext) if ext == "jpg" || ext == "jpeg" => "JPEG",
@@ -617,7 +617,7 @@ impl ChatComposer {
text[safe_cursor..]
.chars()
.next()
.map(|c| c.is_whitespace())
.map(char::is_whitespace)
.unwrap_or(false)
} else {
false
@@ -645,7 +645,7 @@ impl ChatComposer {
let ws_len_right: usize = after_cursor
.chars()
.take_while(|c| c.is_whitespace())
.map(|c| c.len_utf8())
.map(char::len_utf8)
.sum();
let start_right = safe_cursor + ws_len_right;
let end_right_rel = text[start_right..]

3
codex-rs/tui/src/bottom_pane/command_popup.rs
View File

@@ -218,6 +218,7 @@ impl WidgetRef for CommandPopup {
#[cfg(test)]
mod tests {
use super::*;
use std::string::ToString;
#[test]
fn filter_includes_init_when_typing_prefix() {
@@ -287,7 +288,7 @@ mod tests {
let mut prompt_names: Vec<String> = items
.into_iter()
.filter_map(|it| match it {
CommandItem::UserPrompt(i) => popup.prompt_name(i).map(|s| s.to_string()),
CommandItem::UserPrompt(i) => popup.prompt_name(i).map(ToString::to_string),
_ => None,
})
.collect();

2
codex-rs/tui/src/bottom_pane/mod.rs
View File

@@ -103,7 +103,7 @@ impl BottomPane {
}
fn active_view(&self) -> Option<&dyn BottomPaneView> {
self.view_stack.last().map(|view| view.as_ref())
self.view_stack.last().map(std::convert::AsRef::as_ref)
}
fn push_view(&mut self, view: Box<dyn BottomPaneView>) {

2
codex-rs/tui/src/bottom_pane/paste_burst.rs
View File

@@ -183,7 +183,7 @@ impl PasteBurst {
let start_byte = retro_start_index(before, retro_chars);
let grabbed = before[start_byte..].to_string();
let looks_pastey =
grabbed.chars().any(|c| c.is_whitespace()) || grabbed.chars().count() >= 16;
grabbed.chars().any(char::is_whitespace) || grabbed.chars().count() >= 16;
if looks_pastey {
// Note: caller is responsible for removing this slice from UI text.
self.begin_with_retro_grabbed(grabbed.clone(), now);

2
codex-rs/tui/src/chatwidget.rs
View File

@@ -616,7 +616,7 @@ impl ChatWidget {
self.flush_answer_stream_with_separator();
// Emit the proposed command into history (like proposed patches)
self.add_to_history(history_cell::new_proposed_command(&ev.command));
let command = shlex::try_join(ev.command.iter().map(|s| s.as_str()))
let command = shlex::try_join(ev.command.iter().map(String::as_str))
.unwrap_or_else(|_| ev.command.join(" "));
self.notify(Notification::ExecApprovalRequested { command });

7
codex-rs/tui/src/chatwidget/tests.rs
View File

@@ -1044,7 +1044,10 @@ async fn binary_size_transcript_snapshot() {
call_id: e.call_id.clone(),
command: e.command,
cwd: e.cwd,
parsed_cmd: parsed_cmd.into_iter().map(|c| c.into()).collect(),
parsed_cmd: parsed_cmd
.into_iter()
.map(std::convert::Into::into)
.collect(),
}),
}
}
@@ -1121,7 +1124,7 @@ async fn binary_size_transcript_snapshot() {
// Trim trailing spaces to match plain text fixture
lines.push(s.trim_end().to_string());
}
while lines.last().is_some_and(|l| l.is_empty()) {
while lines.last().is_some_and(std::string::String::is_empty) {
lines.pop();
}
// Consider content only after the last session banner marker. Skip the transient

2
codex-rs/tui/src/clipboard_paste.rs
View File

@@ -198,7 +198,7 @@ pub fn pasted_image_format(path: &Path) -> EncodedImageFormat {
match path
.extension()
.and_then(|e| e.to_str())
.map(|s| s.to_ascii_lowercase())
.map(str::to_ascii_lowercase)
.as_deref()
{
Some("png") => EncodedImageFormat::Png,

3
codex-rs/tui/src/diff_render.rs
View File

@@ -1,3 +1,4 @@
use diffy::Hunk;
use ratatui::style::Color;
use ratatui::style::Modifier;
use ratatui::style::Style;
@@ -283,7 +284,7 @@ fn calculate_add_remove_from_diff(diff: &str) -> (usize, usize) {
patch
.hunks()
.iter()
.flat_map(|h| h.lines())
.flat_map(Hunk::lines)
.fold((0, 0), |(a, d), l| match l {
diffy::Line::Insert(_) => (a + 1, d),
diffy::Line::Delete(_) => (a, d + 1),

2
codex-rs/tui/src/exec_command.rs
View File

@@ -5,7 +5,7 @@ use dirs::home_dir;
use shlex::try_join;
pub(crate) fn escape_command(command: &[String]) -> String {
try_join(command.iter().map(|s| s.as_str())).unwrap_or_else(|_| command.join(" "))
try_join(command.iter().map(String::as_str)).unwrap_or_else(|_| command.join(" "))
}
pub(crate) fn strip_bash_lc_and_escape(command: &[String]) -> String {

2
codex-rs/tui/src/history_cell.rs
View File

@@ -388,7 +388,7 @@ impl ExecCell {
vec![(
"Read",
itertools::Itertools::intersperse(
names.into_iter().map(|n| n.into()),
names.into_iter().map(Into::into),
", ".dim(),
)
.collect(),

8
codex-rs/tui/src/markdown_render.rs
View File

@@ -50,11 +50,7 @@ pub(crate) fn render_markdown_text_with_citations(
let mut options = Options::empty();
options.insert(Options::ENABLE_STRIKETHROUGH);
let parser = Parser::new_ext(input, options);
let mut w = Writer::new(
parser,
scheme.map(|s| s.to_string()),
Some(cwd.to_path_buf()),
);
let mut w = Writer::new(parser, scheme.map(str::to_string), Some(cwd.to_path_buf()));
w.run();
w.text
}
@@ -329,7 +325,7 @@ where
let is_ordered = self
.list_indices
.last()
.map(|index| index.is_some())
.map(Option::is_some)
.unwrap_or(false);
let width = depth * 4 - 3;
let marker = if let Some(last_index) = self.list_indices.last_mut() {

2
codex-rs/tui/src/new_model_popup.rs
View File

@@ -98,7 +98,7 @@ impl WidgetRef for &ModelUpgradePopup {
let mut lines: Vec<Line> = Vec::new();
if show_animation {
let frame = self.animation.current_frame();
lines.extend(frame.lines().map(|l| l.into()));
lines.extend(frame.lines().map(Into::into));
// Spacer between animation and text content.
lines.push("".into());
}

2
codex-rs/tui/src/onboarding/welcome.rs
View File

@@ -62,7 +62,7 @@ impl WidgetRef for &WelcomeWidget {
let frame = self.animation.current_frame();
// let frame_line_count = frame.lines().count();
// lines.reserve(frame_line_count + 2);
lines.extend(frame.lines().map(|l| l.into()));
lines.extend(frame.lines().map(Into::into));
lines.push("".into());
}
lines.push(Line::from(vec![

2
codex-rs/tui/src/pager_overlay.rs
View File

@@ -382,7 +382,7 @@ impl TranscriptOverlay {
let cell_lines = if Some(idx) == highlight_cell {
cell.transcript_lines()
.into_iter()
.map(|l| l.reversed())
.map(Stylize::reversed)
.collect()
} else {
cell.transcript_lines()

3
codex-rs/tui/src/wrapping.rs
View File

@@ -329,6 +329,7 @@ mod tests {
use pretty_assertions::assert_eq;
use ratatui::style::Color;
use ratatui::style::Stylize;
use std::string::ToString;
fn concat_line(line: &Line) -> String {
line.spans
@@ -543,7 +544,7 @@ mod tests {
let lines = [line];
// Force small width to exercise wrapping at spaces.
let wrapped = word_wrap_lines_borrowed(&lines, 40);
let joined: String = wrapped.iter().map(|l| l.to_string()).join("\n");
let joined: String = wrapped.iter().map(ToString::to_string).join("\n");
assert_eq!(
joined,
r#"Years passed, and Willowmere thrived