diff --git a/rslib/src/error/mod.rs b/rslib/src/error/mod.rs index f0106b7ab..61d99fd80 100644 --- a/rslib/src/error/mod.rs +++ b/rslib/src/error/mod.rs @@ -22,7 +22,7 @@ pub enum AnkiError { InvalidInput(String), TemplateError { info: String }, TemplateSaveError { ordinal: usize }, - IoError { info: String }, + IoError(String), DbError(DbError), NetworkError(NetworkError), SyncError(SyncError), @@ -96,9 +96,7 @@ pub enum TemplateError { impl From for AnkiError { fn from(err: io::Error) -> Self { - AnkiError::IoError { - info: format!("{:?}", err), - } + AnkiError::IoError(format!("{:?}", err)) } } @@ -128,9 +126,7 @@ impl From for AnkiError { impl From for AnkiError { fn from(e: PathPersistError) -> Self { - AnkiError::IoError { - info: e.to_string(), - } + AnkiError::IoError(e.to_string()) } } diff --git a/rslib/src/media/changetracker.rs b/rslib/src/media/changetracker.rs index 93b9b805e..787a2d206 100644 --- a/rslib/src/media/changetracker.rs +++ b/rslib/src/media/changetracker.rs @@ -151,9 +151,8 @@ where } // add entry to the list - let data = sha1_of_file(&dentry.path()).map_err(|e| AnkiError::IoError { - info: format!("unable to read {}: {}", fname, e), - })?; + let data = sha1_of_file(&dentry.path()) + .map_err(|e| AnkiError::IoError(format!("unable to read {}: {}", fname, e)))?; let sha1 = Some(data); added_or_changed.push(FilesystemEntry { fname: fname.to_string(), diff --git a/rslib/src/media/files.rs b/rslib/src/media/files.rs index bc6d2feb3..6a91f4770 100644 --- a/rslib/src/media/files.rs +++ b/rslib/src/media/files.rs @@ -412,9 +412,10 @@ pub(super) fn data_for_file(media_folder: &Path, fname: &str) -> Result