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

Use fat pointer to avoid propogating generics

Browse source
This commit is contained in:
RumovZ 2022-04-16 22:14:01 +02:00
parent ed24fd13db
commit e65b79ba63
6 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
rslib/src/import_export/package/apkg/import/cards.rs
View file

@ -65,7 +65,7 @@ impl Collection {
} }
} }
impl<F> Context<'_, F> { impl Context<'_> {
pub(super) fn import_cards_and_revlog( pub(super) fn import_cards_and_revlog(
&mut self, &mut self,
imported_notes: &HashMap<NoteId, NoteId>, imported_notes: &HashMap<NoteId, NoteId>,

2
rslib/src/import_export/package/apkg/import/decks.rs
View file

@ -26,7 +26,7 @@ impl<'d> DeckContext<'d> {
} }
} }
impl<F> Context<'_, F> { impl Context<'_> {
pub(super) fn import_decks_and_configs(&mut self) -> Result<HashMap<DeckId, DeckId>> { pub(super) fn import_decks_and_configs(&mut self) -> Result<HashMap<DeckId, DeckId>> {
let mut ctx = DeckContext::new(self.target_col, self.usn); let mut ctx = DeckContext::new(self.target_col, self.usn);
ctx.import_deck_configs(mem::take(&mut self.data.deck_configs))?; ctx.import_deck_configs(mem::take(&mut self.data.deck_configs))?;

2
rslib/src/import_export/package/apkg/import/media.rs
View file

@ -32,7 +32,7 @@ pub(super) struct MediaUseMap {
unchecked: Vec<SafeMediaEntry>, unchecked: Vec<SafeMediaEntry>,
} }
impl<F: FnMut(ImportProgress) -> Result<()>> Context<'_, F> { impl Context<'_> {
pub(super) fn prepare_media(&mut self) -> Result<MediaUseMap> { pub(super) fn prepare_media(&mut self) -> Result<MediaUseMap> {
let progress_fn = |u| (&mut self.progress_fn)(ImportProgress::MediaCheck(u)).is_ok(); let progress_fn = |u| (&mut self.progress_fn)(ImportProgress::MediaCheck(u)).is_ok();
let existing_sha1s = self.target_col.all_existing_sha1s(progress_fn)?; let existing_sha1s = self.target_col.all_existing_sha1s(progress_fn)?;

10
rslib/src/import_export/package/apkg/import/mod.rs
View file

@ -20,19 +20,19 @@ use crate::{
search::SearchNode, search::SearchNode,
}; };
struct Context<'a, F> { struct Context<'a> {
target_col: &'a mut Collection, target_col: &'a mut Collection,
archive: ZipArchive<File>, archive: ZipArchive<File>,
data: ExchangeData, data: ExchangeData,
usn: Usn, usn: Usn,
progress_fn: F, progress_fn: &'a mut dyn Fn(ImportProgress) -> Result<()>,
} }
impl Collection { impl Collection {
pub fn import_apkg( pub fn import_apkg(
&mut self, &mut self,
path: impl AsRef<Path>, path: impl AsRef<Path>,
progress_fn: impl FnMut(ImportProgress) -> Result<()>, progress_fn: &mut dyn Fn(ImportProgress) -> Result<()>,
) -> Result<OpOutput<()>> { ) -> Result<OpOutput<()>> {
let file = File::open(path)?; let file = File::open(path)?;
let archive = ZipArchive::new(file)?; let archive = ZipArchive::new(file)?;
@ -44,11 +44,11 @@ impl Collection {
} }
} }
impl<'a, F: FnMut(ImportProgress) -> Result<()>> Context<'a, F> { impl<'a> Context<'a> {
fn new( fn new(
mut archive: ZipArchive<File>, mut archive: ZipArchive<File>,
target_col: &'a mut Collection, target_col: &'a mut Collection,
progress_fn: F, progress_fn: &'a mut dyn Fn(ImportProgress) -> Result<()>,
) -> Result<Self> { ) -> Result<Self> {
let data = let data =
ExchangeData::gather_from_archive(&mut archive, SearchNode::WholeCollection, true)?; ExchangeData::gather_from_archive(&mut archive, SearchNode::WholeCollection, true)?;

2
rslib/src/import_export/package/apkg/import/notes.rs
View file

@ -43,7 +43,7 @@ impl NoteMeta {
} }
} }
impl<F> Context<'_, F> { impl Context<'_> {
pub(super) fn import_notes_and_notetypes( pub(super) fn import_notes_and_notetypes(
&mut self, &mut self,
media_map: &mut MediaUseMap, media_map: &mut MediaUseMap,

2
rslib/src/import_export/package/apkg/tests.rs
View file

@ -39,7 +39,7 @@ fn roundtrip() {
|_| (), |_| (),
) )
.unwrap(); .unwrap();
target_col.import_apkg(&apkg_path, |_| Ok(())).unwrap(); target_col.import_apkg(&apkg_path, &mut |_| Ok(())).unwrap();
target_col.assert_decks(); target_col.assert_decks();
target_col.assert_notetype(&notetype); target_col.assert_notetype(&notetype);