diff --git a/core/src/avm2/error.rs b/core/src/avm2/error.rs index 3d4737549..8f11e13ef 100644 --- a/core/src/avm2/error.rs +++ b/core/src/avm2/error.rs @@ -132,12 +132,6 @@ impl<'gc> From for Error<'gc> { } } -impl<'gc> From for Error<'gc> { - fn from(val: crate::tag_utils::Error) -> Error<'gc> { - Error::RustError(val.into()) - } -} - impl<'gc> From> for Error<'gc> { fn from(val: Box) -> Error<'gc> { Error::RustError(val) diff --git a/core/src/avm2/globals.rs b/core/src/avm2/globals.rs index 46a8e2dc9..4ae0bed2a 100644 --- a/core/src/avm2/globals.rs +++ b/core/src/avm2/globals.rs @@ -656,9 +656,10 @@ fn load_playerglobal<'gc>( activation.avm2().native_method_table = native::NATIVE_METHOD_TABLE; activation.avm2().native_instance_allocator_table = native::NATIVE_INSTANCE_ALLOCATOR_TABLE; - let movie = Arc::new(SwfMovie::from_data(PLAYERGLOBAL, None, None)?); + let movie = + SwfMovie::from_data(PLAYERGLOBAL, None, None).expect("playerglobal.swf should be valid"); - let slice = SwfSlice::from(movie); + let slice = SwfSlice::from(Arc::new(movie)); let mut reader = slice.read_from(0);