diff --git a/python/src/error.rs b/python/src/error.rs index b8d0b0ab..b0b8f864 100644 --- a/python/src/error.rs +++ b/python/src/error.rs @@ -43,15 +43,9 @@ variant_box_from_error!(WriteMetadataError, VerboseError::Other); variant_box_from_error!(ConditionEvaluationError, VerboseError::Other); variant_box_from_error!(MultilingualMessageContentsError, VerboseError::Other); variant_box_from_error!(RegexError, VerboseError::Other); - -impl From for VerboseError { - fn from(value: GameHandleCreationError) -> Self { - match value { - GameHandleCreationError::LoadOrderError(e) => e.into(), - GameHandleCreationError::NotADirectory(_) | _ => Self::Other(Box::new(value)), - } - } -} +variant_box_from_error!(GameHandleCreationError, VerboseError::Other); +variant_box_from_error!(LoadOrderStateError, VerboseError::Other); +variant_box_from_error!(MetadataRetrievalError, VerboseError::Other); impl From for VerboseError { fn from(value: SortPluginsError) -> Self { @@ -69,15 +63,6 @@ impl From for VerboseError { } } -impl From for VerboseError { - fn from(value: LoadOrderStateError) -> Self { - match value { - LoadOrderStateError::LoadOrderError(e) => e.into(), - LoadOrderStateError::DatabaseLockPoisoned | _ => Self::Other(Box::new(value)), - } - } -} - impl From for VerboseError { fn from(value: GroupsPathError) -> Self { match value { @@ -88,15 +73,6 @@ impl From for VerboseError { } } -impl From for VerboseError { - fn from(value: MetadataRetrievalError) -> Self { - match value { - MetadataRetrievalError::ConditionEvaluationError(e) => e.into(), - MetadataRetrievalError::RegexError(_) => Self::Other(Box::new(value)), - } - } -} - impl From for VerboseError { fn from(value: PluginDataError) -> Self { Self::EspluginError(SystemError::from(value))