chore: Appease clippy, squelch unnecessary_wraps lint

core/src/lib.rs

@@ -2,7 +2,8 @@
     clippy::manual_range_contains,
     clippy::unneeded_field_pattern,
     clippy::same_item_push,
-    clippy::unknown_clippy_lints
+    clippy::unknown_clippy_lints,
+    clippy::unnecessary_wraps
 )]
 
 #[macro_use]

render/canvas/src/lib.rs

@@ -376,10 +376,10 @@ impl WebCanvasRenderBackend {
     ) -> Result<BitmapInfo, Error> {
         let data = ruffle_core::backend::render::remove_invalid_jpeg_data(data);
         let mut decoder = jpeg_decoder::Decoder::new(&data[..]);
-        decoder.read_info().unwrap();
-        let metadata = decoder.info().unwrap();
+        decoder.read_info()?;
+        let metadata = decoder.info().ok_or("Expected JPEG metadata")?;
 
-        let image = HtmlImageElement::new().unwrap();
+        let image = HtmlImageElement::new().into_js_result()?;
         let jpeg_encoded = format!("data:image/jpeg;base64,{}", &base64::encode(&data[..]));
         image.set_src(&jpeg_encoded);
 

render/webgl/src/lib.rs

@@ -312,7 +312,9 @@ impl WebGlRenderBackend {
     }
 
     fn compile_shader(gl: &Gl, shader_type: u32, glsl_src: &str) -> Result<WebGlShader, Error> {
-        let shader = gl.create_shader(shader_type).unwrap();
+        let shader = gl
+            .create_shader(shader_type)
+            .ok_or("Unable to create shader")?;
         gl.shader_source(&shader, glsl_src);
         gl.compile_shader(&shader);
         let log = gl.get_shader_info_log(&shader).unwrap_or_default();

render/wgpu/src/lib.rs

@@ -682,7 +682,7 @@ impl<T: RenderTarget> WgpuRenderBackend<T> {
         id: swf::CharacterId,
         bitmap: Bitmap,
         debug_str: &str,
-    ) -> Result<BitmapInfo, Error> {
+    ) -> BitmapInfo {
         let extent = wgpu::Extent3d {
             width: bitmap.width,
             height: bitmap.height,
@@ -744,11 +744,11 @@ impl<T: RenderTarget> WgpuRenderBackend<T> {
             },
         ));
 
-        Ok(BitmapInfo {
+        BitmapInfo {
             handle,
             width: bitmap.width.try_into().unwrap(),
             height: bitmap.height.try_into().unwrap(),
-        })
+        }
     }
 
     pub fn target(&self) -> &T {
@@ -843,7 +843,7 @@ impl<T: RenderTarget + 'static> RenderBackend for WgpuRenderBackend<T> {
 
     fn register_bitmap_jpeg_2(&mut self, id: u16, data: &[u8]) -> Result<BitmapInfo, Error> {
         let bitmap = ruffle_core::backend::render::decode_define_bits_jpeg(data, None)?;
-        self.register_bitmap(id, bitmap, "JPEG2")
+        Ok(self.register_bitmap(id, bitmap, "JPEG2"))
     }
 
     fn register_bitmap_jpeg_3(
@@ -854,12 +854,12 @@ impl<T: RenderTarget + 'static> RenderBackend for WgpuRenderBackend<T> {
     ) -> Result<BitmapInfo, Error> {
         let bitmap =
             ruffle_core::backend::render::decode_define_bits_jpeg(jpeg_data, Some(alpha_data))?;
-        self.register_bitmap(id, bitmap, "JPEG3")
+        Ok(self.register_bitmap(id, bitmap, "JPEG3"))
     }
 
     fn register_bitmap_png(&mut self, swf_tag: &DefineBitsLossless) -> Result<BitmapInfo, Error> {
         let bitmap = ruffle_core::backend::render::decode_define_bits_lossless(swf_tag)?;
-        self.register_bitmap(swf_tag.id, bitmap, "PNG")
+        Ok(self.register_bitmap(swf_tag.id, bitmap, "PNG"))
     }
 
     fn begin_frame(&mut self, clear: Color) {

swf/src/read.rs

@@ -1,6 +1,7 @@
 #![allow(
     clippy::float_cmp,
     clippy::inconsistent_digit_grouping,
+    clippy::unknown_clippy_lints,
     clippy::unreadable_literal
 )]
 
@@ -128,6 +129,7 @@ pub fn read_swf_header<'a, R: Read + 'a>(mut input: R) -> Result<SwfStream<'a>>
 }
 
 #[cfg(feature = "flate2")]
+#[allow(clippy::unnecessary_wraps)]
 fn make_zlib_reader<'a, R: Read + 'a>(input: R) -> Result<Box<dyn Read + 'a>> {
     use flate2::read::ZlibDecoder;
     Ok(Box::new(ZlibDecoder::new(input)))