Skip to content

Commit fb8b321

Browse files
committed
fix: 修复 clippy 的警告
1 parent 8bb3db4 commit fb8b321

2 files changed

Lines changed: 22 additions & 15 deletions

File tree

src/analytics/model_stats.rs

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -120,13 +120,15 @@ pub fn build_model_chart(
120120
})
121121
.collect::<Vec<_>>();
122122

123-
rows.sort_by(|left, right| right.total_tokens.cmp(&left.total_tokens));
123+
rows.sort_by_key(|right| std::cmp::Reverse(right.total_tokens));
124124

125125
let top_models = rows
126126
.iter()
127127
.map(|row| row.model_id.clone())
128128
.collect::<Vec<_>>();
129-
let chart = build_chart_for_models(events, &top_models, range, today, |event| event.model_id.clone());
129+
let chart = build_chart_for_models(events, &top_models, range, today, |event| {
130+
event.model_id.clone()
131+
});
130132
(rows, chart)
131133
}
132134

@@ -198,7 +200,7 @@ pub fn build_provider_chart(
198200
})
199201
.collect::<Vec<_>>();
200202

201-
rows.sort_by(|left, right| right.total_tokens.cmp(&left.total_tokens));
203+
rows.sort_by_key(|right| std::cmp::Reverse(right.total_tokens));
202204

203205
let providers = rows
204206
.iter()
@@ -332,7 +334,12 @@ fn format_label(date: &NaiveDate) -> String {
332334
}
333335

334336
fn format_label_all(date: &NaiveDate) -> String {
335-
format!("{} {} {:<2}", date.year() % 100, date.format("%b"), date.day())
337+
format!(
338+
"{} {} {:<2}",
339+
date.year() % 100,
340+
date.format("%b"),
341+
date.day()
342+
)
336343
}
337344

338345
fn build_x_labels(days: &[NaiveDate], range: TimeRange) -> Vec<String> {
@@ -349,8 +356,10 @@ fn build_x_labels(days: &[NaiveDate], range: TimeRange) -> Vec<String> {
349356
TimeRange::Last30Days => {
350357
let step = 5;
351358
let last = days.len() - 1;
352-
let mut labels: Vec<String> =
353-
(0..last).step_by(step).map(|i| format_label(&days[i])).collect();
359+
let mut labels: Vec<String> = (0..last)
360+
.step_by(step)
361+
.map(|i| format_label(&days[i]))
362+
.collect();
354363
labels.push(format_label(&days[last]));
355364
labels
356365
}

src/ui/models.rs

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ impl SearchState {
2727
pub fn new(ids: Vec<String>, focused_index: usize) -> Self {
2828
let total = ids.len();
2929
let selected = focused_index.min(total.saturating_sub(1));
30-
let scroll_offset = if selected > 4 { selected - 4 } else { 0 };
30+
let scroll_offset = selected.saturating_sub(4);
3131
Self {
3232
query: String::new(),
3333
ids,
@@ -48,9 +48,7 @@ impl SearchState {
4848
.selected
4949
.min(self.filtered_indices.len().saturating_sub(1));
5050
let filtered_total = self.filtered_indices.len();
51-
self.scroll_offset = self
52-
.scroll_offset
53-
.min(filtered_total.saturating_sub(5));
51+
self.scroll_offset = self.scroll_offset.min(filtered_total.saturating_sub(5));
5452
if self.scroll_offset > self.selected {
5553
self.scroll_offset = self.selected;
5654
}
@@ -543,14 +541,14 @@ fn render_search_overlay<T: SearchItem>(
543541

544542
let input_prefix = " ● ";
545543
let prefix_w = UnicodeWidthStr::width(input_prefix) as u16;
546-
let max_input_w = input_area
547-
.width
548-
.saturating_sub(prefix_w)
549-
.saturating_sub(1);
544+
let max_input_w = input_area.width.saturating_sub(prefix_w).saturating_sub(1);
550545
let display_query = truncate_query_left(&search.query, max_input_w);
551546
let input_line = Line::from(vec![
552547
Span::styled(input_prefix, theme.muted_style()),
553-
Span::styled(format!("{}_", display_query), Style::default().fg(theme.foreground)),
548+
Span::styled(
549+
format!("{}_", display_query),
550+
Style::default().fg(theme.foreground),
551+
),
554552
]);
555553
frame.render_widget(Paragraph::new(input_line), input_area);
556554
frame.render_widget(

0 commit comments

Comments
 (0)