mirror/rustlings
1
0
Fork 0
mirror of https://github.com/rust-lang/rustlings.git synced 2024-12-26 00:00:03 +03:00
Code Issues Packages Projects Releases Wiki Activity

Simplify building rows.

Browse source 
No more lifetimes championship :(
This commit is contained in:
mo8it 2024-04-08 03:16:38 +02:00
parent 1db5de9653
commit 7c46e7ac69
1 changed files with 16 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
src/list/state.rs
View file

@ -26,28 +26,20 @@ pub struct UiState<'a> {
} }
impl<'a> UiState<'a> { impl<'a> UiState<'a> {
fn rows<'s, 'c, 'i>( pub fn with_updated_rows(mut self, state_file: &StateFile) -> Self {
state_file: &'s StateFile, let mut rows_counter: usize = 0;
exercises: &'a [Exercise], let rows = self
rows_counter: &'c mut usize, .exercises
filter: Filter,
) -> impl Iterator<Item = Row<'a>> + 'i
where
's: 'i,
'a: 'i,
'c: 'i,
{
exercises
.iter() .iter()
.zip(state_file.progress().iter().copied()) .zip(state_file.progress().iter().copied())
.enumerate() .enumerate()
.filter_map(move |(ind, (exercise, done))| { .filter_map(|(ind, (exercise, done))| {
match (filter, done) { match (self.filter, done) {
(Filter::Done, false) | (Filter::Pending, true) => return None, (Filter::Done, false) | (Filter::Pending, true) => return None,
_ => (), _ => (),
} }
*rows_counter += 1; rows_counter += 1;
let next = if ind == state_file.next_exercise_ind() { let next = if ind == state_file.next_exercise_ind() {
">>>>".bold().red() ">>>>".bold().red()
@ -67,12 +59,8 @@ impl<'a> UiState<'a> {
Span::raw(&exercise.name), Span::raw(&exercise.name),
Span::raw(exercise.path.to_string_lossy()), Span::raw(exercise.path.to_string_lossy()),
])) ]))
}) });
}
pub fn with_updated_rows(mut self, state_file: &StateFile) -> Self {
let mut rows_counter = 0;
let rows = Self::rows(state_file, self.exercises, &mut rows_counter, self.filter);
self.table = self.table.rows(rows); self.table = self.table.rows(rows);
self.last_ind = rows_counter.saturating_sub(1); self.last_ind = rows_counter.saturating_sub(1);
@ -97,11 +85,8 @@ impl<'a> UiState<'a> {
Constraint::Fill(1), Constraint::Fill(1),
]; ];
let filter = Filter::None; let table = Table::default()
let mut rows_counter = 0; .widths(widths)
let rows = Self::rows(state_file, exercises, &mut rows_counter, filter);
let table = Table::new(rows, widths)
.header(header) .header(header)
.column_spacing(2) .column_spacing(2)
.highlight_spacing(HighlightSpacing::Always) .highlight_spacing(HighlightSpacing::Always)
@ -114,15 +99,17 @@ impl<'a> UiState<'a> {
.with_offset(selected.saturating_sub(10)) .with_offset(selected.saturating_sub(10))
.with_selected(Some(selected)); .with_selected(Some(selected));
Self { let slf = Self {
table, table,
message: String::with_capacity(128), message: String::with_capacity(128),
filter, filter: Filter::None,
exercises, exercises,
selected, selected,
table_state, table_state,
last_ind: rows_counter.saturating_sub(1), last_ind: 0,
} };
slf.with_updated_rows(state_file)
} }
#[inline] #[inline]