GitHub/Anki
1
0
Fork 0
mirror of https://github.com/ankitects/anki.git synced 2025-09-21 07:22:23 -04:00
Code Issues Projects Releases Packages 1 Wiki Activity Actions

Pass Column by value

Browse source
This commit is contained in:
RumovZ 2021-03-31 00:02:10 +02:00
parent 8779fb5ede
commit 5e151cdc42
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
rslib/src/browser_table.rs
View file

@ -79,13 +79,13 @@ pub struct Font {
}
trait RowContext {
fn get_cell_text(&mut self, column: &Column) -> Result<String>;
fn get_cell_text(&mut self, column: Column) -> Result<String>;
fn get_row_color(&self) -> Color;
fn get_row_font(&self) -> Result<Font>;
fn note(&self) -> &Note;
fn notetype(&self) -> &Notetype;
fn get_cell(&mut self, column: &Column) -> Result<Cell> {
fn get_cell(&mut self, column: Column) -> Result<Cell> {
Ok(Cell {
text: self.get_cell_text(column)?,
is_rtl: self.get_is_rtl(column),
@ -103,7 +103,7 @@ trait RowContext {
html_to_text_line(&self.note().fields()[index]).into()
}
fn get_is_rtl(&self, column: &Column) -> bool {
fn get_is_rtl(&self, column: Column) -> bool {
match column {
Column::NoteField => {
let index = self.notetype().config.sort_field_idx as usize;
@ -117,7 +117,7 @@ trait RowContext {
Ok(Row {
cells: columns
.iter()
.map(|column| self.get_cell(column))
.map(|&column| self.get_cell(column))
.collect::<Result<_>>()?,
color: self.get_row_color(),
font: self.get_row_font()?,
@ -389,7 +389,7 @@ impl<'a> CardRowContext<'a> {
}
impl RowContext for CardRowContext<'_> {
fn get_cell_text(&mut self, column: &Column) -> Result<String> {
fn get_cell_text(&mut self, column: Column) -> Result<String> {
Ok(match column {
Column::Question => self.question_str(),
Column::Answer => self.answer_str(),
@ -516,7 +516,7 @@ impl<'a> NoteRowContext<'a> {
}
impl RowContext for NoteRowContext<'_> {
fn get_cell_text(&mut self, column: &Column) -> Result<String> {
fn get_cell_text(&mut self, column: Column) -> Result<String> {
Ok(match column {
Column::NoteCards => self.cards.len().to_string(),
Column::NoteCreation => self.note_creation_str(),