From c98c173c6b09b7c8663a9a28330a7783998127cb Mon Sep 17 00:00:00 2001
From: Lord-McSweeney <Lord-McSweeney@github.com>
Date: Sat, 3 Aug 2024 18:43:34 -0700
Subject: [PATCH] chore: Run `cargo fix`

---
 core/src/avm2/object/bitmapdata_object.rs       | 1 -
 core/src/avm2/object/class_object.rs            | 1 -
 core/src/avm2/object/context3d_object.rs        | 3 +--
 core/src/avm2/object/date_object.rs             | 3 +--
 core/src/avm2/object/dictionary_object.rs       | 1 -
 core/src/avm2/object/domain_object.rs           | 1 -
 core/src/avm2/object/error_object.rs            | 2 --
 core/src/avm2/object/file_reference_object.rs   | 3 +--
 core/src/avm2/object/font_object.rs             | 2 --
 core/src/avm2/object/function_object.rs         | 2 +-
 core/src/avm2/object/index_buffer_3d_object.rs  | 3 +--
 core/src/avm2/object/loaderinfo_object.rs       | 2 +-
 core/src/avm2/object/local_connection_object.rs | 3 +--
 core/src/avm2/object/namespace_object.rs        | 1 -
 core/src/avm2/object/net_connection_object.rs   | 3 +--
 core/src/avm2/object/netstream_object.rs        | 2 --
 core/src/avm2/object/program_3d_object.rs       | 3 +--
 core/src/avm2/object/proxy_object.rs            | 2 --
 core/src/avm2/object/qname_object.rs            | 2 +-
 core/src/avm2/object/responder_object.rs        | 1 -
 core/src/avm2/object/script_object.rs           | 1 -
 core/src/avm2/object/shader_data_object.rs      | 3 +--
 core/src/avm2/object/socket_object.rs           | 3 +--
 core/src/avm2/object/sound_object.rs            | 1 -
 core/src/avm2/object/soundchannel_object.rs     | 3 +--
 core/src/avm2/object/stage3d_object.rs          | 2 +-
 core/src/avm2/object/stage_object.rs            | 2 --
 core/src/avm2/object/textformat_object.rs       | 1 -
 core/src/avm2/object/texture_object.rs          | 2 --
 core/src/avm2/object/vertex_buffer_3d_object.rs | 2 --
 core/src/avm2/object/xml_object.rs              | 1 -
 31 files changed, 14 insertions(+), 48 deletions(-)

diff --git a/core/src/avm2/object/bitmapdata_object.rs b/core/src/avm2/object/bitmapdata_object.rs
index 8e80e1f7f..52a08e42a 100644
--- a/core/src/avm2/object/bitmapdata_object.rs
+++ b/core/src/avm2/object/bitmapdata_object.rs
@@ -12,7 +12,6 @@ use gc_arena::{
     lock::{Lock, RefLock},
     Collect, Gc, GcWeak, Mutation,
 };
-use std::cell::{Ref, RefMut};
 
 /// A class instance allocator that allocates BitmapData objects.
 pub fn bitmap_data_allocator<'gc>(
diff --git a/core/src/avm2/object/class_object.rs b/core/src/avm2/object/class_object.rs
index 949e5fa31..c03d38ff9 100644
--- a/core/src/avm2/object/class_object.rs
+++ b/core/src/avm2/object/class_object.rs
@@ -23,7 +23,6 @@ use gc_arena::{
     lock::{Lock, RefLock},
     Collect, Gc, GcWeak, Mutation,
 };
-use std::cell::{Ref, RefMut};
 use std::fmt::Debug;
 use std::hash::{Hash, Hasher};
 
diff --git a/core/src/avm2/object/context3d_object.rs b/core/src/avm2/object/context3d_object.rs
index 050ac67e9..8011e8799 100644
--- a/core/src/avm2/object/context3d_object.rs
+++ b/core/src/avm2/object/context3d_object.rs
@@ -8,7 +8,6 @@ use crate::avm2::Error;
 use crate::avm2_stub_method;
 use crate::bitmap::bitmap_data::BitmapData;
 use crate::context::RenderContext;
-use gc_arena::barrier::unlock;
 use gc_arena::lock::RefLock;
 use gc_arena::{Collect, Gc, GcCell, GcWeak, Mutation};
 use ruffle_render::backend::{
@@ -17,7 +16,7 @@ use ruffle_render::backend::{
     Texture,
 };
 use ruffle_render::commands::CommandHandler;
-use std::cell::{Cell, Ref, RefMut};
+use std::cell::Cell;
 use std::rc::Rc;
 use swf::{Rectangle, Twips};
 
diff --git a/core/src/avm2/object/date_object.rs b/core/src/avm2/object/date_object.rs
index 7c12d35e6..bf304e97c 100644
--- a/core/src/avm2/object/date_object.rs
+++ b/core/src/avm2/object/date_object.rs
@@ -5,10 +5,9 @@ use crate::avm2::value::{Hint, Value};
 use crate::avm2::Error;
 use chrono::{DateTime, Utc};
 use core::fmt;
-use gc_arena::barrier::unlock;
 use gc_arena::lock::RefLock;
 use gc_arena::{Collect, Gc, GcWeak, Mutation};
-use std::cell::{Cell, Ref, RefMut};
+use std::cell::Cell;
 
 /// A class instance allocator that allocates Date objects.
 pub fn date_allocator<'gc>(
diff --git a/core/src/avm2/object/dictionary_object.rs b/core/src/avm2/object/dictionary_object.rs
index 0255bc4fd..4465de039 100644
--- a/core/src/avm2/object/dictionary_object.rs
+++ b/core/src/avm2/object/dictionary_object.rs
@@ -10,7 +10,6 @@ use crate::string::AvmString;
 use core::fmt;
 use gc_arena::barrier::unlock;
 use gc_arena::{lock::RefLock, Collect, Gc, GcWeak, Mutation};
-use std::cell::{Ref, RefMut};
 
 /// A class instance allocator that allocates Dictionary objects.
 pub fn dictionary_allocator<'gc>(
diff --git a/core/src/avm2/object/domain_object.rs b/core/src/avm2/object/domain_object.rs
index b734750d9..03c8c61d3 100644
--- a/core/src/avm2/object/domain_object.rs
+++ b/core/src/avm2/object/domain_object.rs
@@ -12,7 +12,6 @@ use gc_arena::{
     lock::{Lock, RefLock},
     Collect, Gc, GcWeak, Mutation,
 };
-use std::cell::{Ref, RefMut};
 
 /// A class instance allocator that allocates AppDomain objects.
 pub fn application_domain_allocator<'gc>(
diff --git a/core/src/avm2/object/error_object.rs b/core/src/avm2/object/error_object.rs
index 8dbdd6741..2af7bf471 100644
--- a/core/src/avm2/object/error_object.rs
+++ b/core/src/avm2/object/error_object.rs
@@ -8,9 +8,7 @@ use crate::avm2::value::Value;
 use crate::avm2::Error;
 use crate::string::WString;
 use core::fmt;
-use gc_arena::barrier::unlock;
 use gc_arena::{lock::RefLock, Collect, Gc, GcWeak, Mutation};
-use std::cell::{Ref, RefMut};
 use std::fmt::Debug;
 use tracing::{enabled, Level};
 
diff --git a/core/src/avm2/object/file_reference_object.rs b/core/src/avm2/object/file_reference_object.rs
index 04272bf41..77361c131 100644
--- a/core/src/avm2/object/file_reference_object.rs
+++ b/core/src/avm2/object/file_reference_object.rs
@@ -3,10 +3,9 @@ use crate::avm2::object::{ClassObject, Object, ObjectPtr, TObject};
 use crate::avm2::value::Value;
 use crate::avm2::{Activation, Error};
 use crate::backend::ui::FileDialogResult;
-use gc_arena::barrier::unlock;
 use gc_arena::{lock::RefLock, Collect, Gc};
 use gc_arena::{GcWeak, Mutation};
-use std::cell::{Cell, Ref, RefCell, RefMut};
+use std::cell::{Cell, Ref, RefCell};
 use std::fmt;
 
 pub fn file_reference_allocator<'gc>(
diff --git a/core/src/avm2/object/font_object.rs b/core/src/avm2/object/font_object.rs
index 375530e84..f28a15f57 100644
--- a/core/src/avm2/object/font_object.rs
+++ b/core/src/avm2/object/font_object.rs
@@ -4,9 +4,7 @@ use crate::avm2::value::Value;
 use crate::avm2::{Activation, ClassObject, Error};
 use crate::character::Character;
 use crate::font::Font;
-use gc_arena::barrier::unlock;
 use gc_arena::{lock::RefLock, Collect, Gc, GcWeak, Mutation};
-use std::cell::{Ref, RefMut};
 use std::fmt;
 
 /// A class instance allocator that allocates Font objects.
diff --git a/core/src/avm2/object/function_object.rs b/core/src/avm2/object/function_object.rs
index 8ae74dcc3..751732fce 100644
--- a/core/src/avm2/object/function_object.rs
+++ b/core/src/avm2/object/function_object.rs
@@ -14,7 +14,7 @@ use gc_arena::{
     lock::{Lock, RefLock},
     Collect, Gc, GcCell, GcWeak, Mutation,
 };
-use std::cell::{Ref, RefMut};
+use std::cell::Ref;
 
 /// A class instance allocator that allocates Function objects.
 /// This is only used when ActionScript manually calls 'new Function()',
diff --git a/core/src/avm2/object/index_buffer_3d_object.rs b/core/src/avm2/object/index_buffer_3d_object.rs
index 2d73a12c2..247a44b9d 100644
--- a/core/src/avm2/object/index_buffer_3d_object.rs
+++ b/core/src/avm2/object/index_buffer_3d_object.rs
@@ -5,11 +5,10 @@ use crate::avm2::object::script_object::ScriptObjectData;
 use crate::avm2::object::{Object, ObjectPtr, TObject};
 use crate::avm2::value::Value;
 use crate::avm2::Error;
-use gc_arena::barrier::unlock;
 use gc_arena::lock::RefLock;
 use gc_arena::{Collect, Gc, GcWeak, Mutation};
 use ruffle_render::backend::IndexBuffer;
-use std::cell::{Cell, Ref, RefCell, RefMut};
+use std::cell::{Cell, RefCell, RefMut};
 
 use super::Context3DObject;
 
diff --git a/core/src/avm2/object/loaderinfo_object.rs b/core/src/avm2/object/loaderinfo_object.rs
index 987ddb783..3878d3527 100644
--- a/core/src/avm2/object/loaderinfo_object.rs
+++ b/core/src/avm2/object/loaderinfo_object.rs
@@ -18,7 +18,7 @@ use gc_arena::{
     lock::{Lock, RefLock},
     Collect, Gc, GcWeak, Mutation,
 };
-use std::cell::{Cell, Ref, RefMut};
+use std::cell::{Cell, Ref};
 use std::sync::Arc;
 
 /// ActionScript cannot construct a LoaderInfo. Note that LoaderInfo isn't a final class.
diff --git a/core/src/avm2/object/local_connection_object.rs b/core/src/avm2/object/local_connection_object.rs
index f0e245e60..45cd2c333 100644
--- a/core/src/avm2/object/local_connection_object.rs
+++ b/core/src/avm2/object/local_connection_object.rs
@@ -9,9 +9,8 @@ use crate::local_connection::{LocalConnectionHandle, LocalConnections};
 use crate::string::AvmString;
 use core::fmt;
 use flash_lso::types::Value as AmfValue;
-use gc_arena::barrier::unlock;
 use gc_arena::{lock::RefLock, Collect, Gc, GcWeak, Mutation};
-use std::cell::{Ref, RefCell, RefMut};
+use std::cell::RefCell;
 
 /// A class instance allocator that allocates LocalConnection objects.
 pub fn local_connection_allocator<'gc>(
diff --git a/core/src/avm2/object/namespace_object.rs b/core/src/avm2/object/namespace_object.rs
index e4b43b79d..c9a2b1aa9 100644
--- a/core/src/avm2/object/namespace_object.rs
+++ b/core/src/avm2/object/namespace_object.rs
@@ -13,7 +13,6 @@ use gc_arena::{
     lock::{Lock, RefLock},
     Collect, Gc, GcWeak, Mutation,
 };
-use std::cell::{Ref, RefMut};
 
 /// A class instance allocator that allocates namespace objects.
 pub fn namespace_allocator<'gc>(
diff --git a/core/src/avm2/object/net_connection_object.rs b/core/src/avm2/object/net_connection_object.rs
index 7984823c0..418b8ad1f 100644
--- a/core/src/avm2/object/net_connection_object.rs
+++ b/core/src/avm2/object/net_connection_object.rs
@@ -6,10 +6,9 @@ use crate::avm2::object::{ClassObject, Object, ObjectPtr, TObject};
 use crate::avm2::value::Value;
 use crate::avm2::Error;
 use crate::net_connection::NetConnectionHandle;
-use gc_arena::barrier::unlock;
 use gc_arena::lock::RefLock;
 use gc_arena::{Collect, Gc, GcWeak, Mutation};
-use std::cell::{Cell, Ref, RefMut};
+use std::cell::Cell;
 use std::fmt;
 use std::fmt::Debug;
 
diff --git a/core/src/avm2/object/netstream_object.rs b/core/src/avm2/object/netstream_object.rs
index cd51487d0..1639006f3 100644
--- a/core/src/avm2/object/netstream_object.rs
+++ b/core/src/avm2/object/netstream_object.rs
@@ -6,9 +6,7 @@ use crate::avm2::object::{ClassObject, Object, ObjectPtr, TObject};
 use crate::avm2::value::Value;
 use crate::avm2::Error;
 use crate::streams::NetStream;
-use gc_arena::barrier::unlock;
 use gc_arena::{lock::RefLock, Collect, Gc, GcWeak, Mutation};
-use std::cell::{Ref, RefMut};
 use std::fmt::Debug;
 
 pub fn netstream_allocator<'gc>(
diff --git a/core/src/avm2/object/program_3d_object.rs b/core/src/avm2/object/program_3d_object.rs
index 75c32fe5f..10059fb75 100644
--- a/core/src/avm2/object/program_3d_object.rs
+++ b/core/src/avm2/object/program_3d_object.rs
@@ -5,11 +5,10 @@ use crate::avm2::object::script_object::ScriptObjectData;
 use crate::avm2::object::{Object, ObjectPtr, TObject};
 use crate::avm2::value::Value;
 use crate::avm2::Error;
-use gc_arena::barrier::unlock;
 use gc_arena::lock::RefLock;
 use gc_arena::{Collect, Gc, GcWeak, Mutation};
 use ruffle_render::backend::ShaderModule;
-use std::cell::{Ref, RefCell, RefMut};
+use std::cell::RefCell;
 use std::rc::Rc;
 
 use super::Context3DObject;
diff --git a/core/src/avm2/object/proxy_object.rs b/core/src/avm2/object/proxy_object.rs
index 616827d40..eec9abb26 100644
--- a/core/src/avm2/object/proxy_object.rs
+++ b/core/src/avm2/object/proxy_object.rs
@@ -8,9 +8,7 @@ use crate::avm2::value::Value;
 use crate::avm2::Error;
 use crate::avm2::Multiname;
 use core::fmt;
-use gc_arena::barrier::unlock;
 use gc_arena::{lock::RefLock, Collect, Gc, GcWeak, Mutation};
-use std::cell::{Ref, RefMut};
 
 /// A class instance allocator that allocates Proxy objects.
 pub fn proxy_allocator<'gc>(
diff --git a/core/src/avm2/object/qname_object.rs b/core/src/avm2/object/qname_object.rs
index 20db8977b..3d0a4995a 100644
--- a/core/src/avm2/object/qname_object.rs
+++ b/core/src/avm2/object/qname_object.rs
@@ -11,7 +11,7 @@ use crate::avm2::Namespace;
 use core::fmt;
 use gc_arena::barrier::unlock;
 use gc_arena::{lock::RefLock, Collect, Gc, GcWeak, Mutation};
-use std::cell::{Ref, RefMut};
+use std::cell::Ref;
 
 /// A class instance allocator that allocates QName objects.
 pub fn q_name_allocator<'gc>(
diff --git a/core/src/avm2/object/responder_object.rs b/core/src/avm2/object/responder_object.rs
index 98514142c..f90328af4 100644
--- a/core/src/avm2/object/responder_object.rs
+++ b/core/src/avm2/object/responder_object.rs
@@ -10,7 +10,6 @@ use gc_arena::{
     lock::{Lock, RefLock},
     Collect, Gc, GcWeak, Mutation,
 };
-use std::cell::{Ref, RefMut};
 use std::fmt;
 
 /// A class instance allocator that allocates Responder objects.
diff --git a/core/src/avm2/object/script_object.rs b/core/src/avm2/object/script_object.rs
index b7085ff0b..8bae25dd3 100644
--- a/core/src/avm2/object/script_object.rs
+++ b/core/src/avm2/object/script_object.rs
@@ -11,7 +11,6 @@ use crate::avm2::Multiname;
 use crate::avm2::{Error, QName};
 use crate::string::AvmString;
 use gc_arena::{lock::RefLock, Collect, Gc, GcWeak, Mutation};
-use std::cell::{Ref, RefMut};
 use std::fmt::Debug;
 
 /// A class instance allocator that allocates `ScriptObject`s.
diff --git a/core/src/avm2/object/shader_data_object.rs b/core/src/avm2/object/shader_data_object.rs
index 46c2bd333..6260c9f87 100644
--- a/core/src/avm2/object/shader_data_object.rs
+++ b/core/src/avm2/object/shader_data_object.rs
@@ -6,11 +6,10 @@ use crate::avm2::object::{ClassObject, Object, ObjectPtr, TObject};
 use crate::avm2::value::Value;
 use crate::avm2::Error;
 use core::fmt;
-use gc_arena::barrier::unlock;
 use gc_arena::lock::RefLock;
 use gc_arena::{Collect, Gc, GcWeak, Mutation};
 use ruffle_render::pixel_bender::PixelBenderShaderHandle;
-use std::cell::{Cell, Ref, RefMut};
+use std::cell::Cell;
 
 /// A class instance allocator that allocates ShaderData objects.
 pub fn shader_data_allocator<'gc>(
diff --git a/core/src/avm2/object/socket_object.rs b/core/src/avm2/object/socket_object.rs
index 6b05dee0c..f85288732 100644
--- a/core/src/avm2/object/socket_object.rs
+++ b/core/src/avm2/object/socket_object.rs
@@ -4,10 +4,9 @@ use crate::avm2::object::{ClassObject, Object, ObjectPtr, TObject};
 use crate::avm2::value::Value;
 use crate::avm2::{Activation, Error};
 use crate::socket::SocketHandle;
-use gc_arena::barrier::unlock;
 use gc_arena::{lock::RefLock, Collect, Gc};
 use gc_arena::{GcWeak, Mutation};
-use std::cell::{Cell, Ref, RefCell, RefMut};
+use std::cell::{Cell, RefCell, RefMut};
 use std::fmt;
 
 /// A class instance allocator that allocates ShaderData objects.
diff --git a/core/src/avm2/object/sound_object.rs b/core/src/avm2/object/sound_object.rs
index 425b24177..bfa4dc465 100644
--- a/core/src/avm2/object/sound_object.rs
+++ b/core/src/avm2/object/sound_object.rs
@@ -18,7 +18,6 @@ use gc_arena::{
     Collect, Gc, GcWeak, Mutation,
 };
 use id3::{Tag, TagLike};
-use std::cell::{Ref, RefMut};
 use std::io::Cursor;
 use swf::SoundInfo;
 
diff --git a/core/src/avm2/object/soundchannel_object.rs b/core/src/avm2/object/soundchannel_object.rs
index 3389a03ad..eaabedac4 100644
--- a/core/src/avm2/object/soundchannel_object.rs
+++ b/core/src/avm2/object/soundchannel_object.rs
@@ -9,9 +9,8 @@ use crate::backend::audio::SoundInstanceHandle;
 use crate::context::UpdateContext;
 use crate::display_object::SoundTransform;
 use core::fmt;
-use gc_arena::barrier::unlock;
 use gc_arena::{lock::RefLock, Collect, Gc, GcWeak, Mutation};
-use std::cell::{Cell, Ref, RefCell, RefMut};
+use std::cell::{Cell, RefCell};
 
 /// A class instance allocator that allocates SoundChannel objects.
 pub fn sound_channel_allocator<'gc>(
diff --git a/core/src/avm2/object/stage3d_object.rs b/core/src/avm2/object/stage3d_object.rs
index f50255580..c0a0bca79 100644
--- a/core/src/avm2/object/stage3d_object.rs
+++ b/core/src/avm2/object/stage3d_object.rs
@@ -9,7 +9,7 @@ use core::fmt;
 use gc_arena::barrier::unlock;
 use gc_arena::lock::{Lock, RefLock};
 use gc_arena::{Collect, Gc, GcWeak, Mutation};
-use std::cell::{Cell, Ref, RefMut};
+use std::cell::Cell;
 
 /// A class instance allocator that allocates Stage3D objects.
 pub fn stage_3d_allocator<'gc>(
diff --git a/core/src/avm2/object/stage_object.rs b/core/src/avm2/object/stage_object.rs
index 842081d22..efa33de4d 100644
--- a/core/src/avm2/object/stage_object.rs
+++ b/core/src/avm2/object/stage_object.rs
@@ -6,9 +6,7 @@ use crate::avm2::object::{ClassObject, Object, ObjectPtr, TObject};
 use crate::avm2::value::Value;
 use crate::avm2::Error;
 use crate::display_object::DisplayObject;
-use gc_arena::barrier::unlock;
 use gc_arena::{lock::RefLock, Collect, Gc, GcWeak, Mutation};
-use std::cell::{Ref, RefMut};
 use std::fmt::Debug;
 
 #[derive(Clone, Collect, Copy)]
diff --git a/core/src/avm2/object/textformat_object.rs b/core/src/avm2/object/textformat_object.rs
index cbdc2fe6a..8918e15e7 100644
--- a/core/src/avm2/object/textformat_object.rs
+++ b/core/src/avm2/object/textformat_object.rs
@@ -7,7 +7,6 @@ use crate::avm2::value::Value;
 use crate::avm2::Error;
 use crate::html::{TextDisplay, TextFormat};
 use core::fmt;
-use gc_arena::barrier::unlock;
 use gc_arena::lock::RefLock;
 use gc_arena::{Collect, Gc, GcWeak, Mutation};
 use std::cell::{Ref, RefCell, RefMut};
diff --git a/core/src/avm2/object/texture_object.rs b/core/src/avm2/object/texture_object.rs
index aa56f6d8a..d8cf1496b 100644
--- a/core/src/avm2/object/texture_object.rs
+++ b/core/src/avm2/object/texture_object.rs
@@ -5,11 +5,9 @@ use crate::avm2::object::script_object::ScriptObjectData;
 use crate::avm2::object::{Object, ObjectPtr, TObject};
 use crate::avm2::value::Value;
 use crate::avm2::Error;
-use gc_arena::barrier::unlock;
 use gc_arena::lock::RefLock;
 use gc_arena::{Collect, Gc, GcWeak, Mutation};
 use ruffle_render::backend::{Context3DTextureFormat, Texture};
-use std::cell::{Ref, RefMut};
 use std::rc::Rc;
 
 use super::{ClassObject, Context3DObject};
diff --git a/core/src/avm2/object/vertex_buffer_3d_object.rs b/core/src/avm2/object/vertex_buffer_3d_object.rs
index cc768b58f..35cd4459b 100644
--- a/core/src/avm2/object/vertex_buffer_3d_object.rs
+++ b/core/src/avm2/object/vertex_buffer_3d_object.rs
@@ -5,11 +5,9 @@ use crate::avm2::object::script_object::ScriptObjectData;
 use crate::avm2::object::{Object, ObjectPtr, TObject};
 use crate::avm2::value::Value;
 use crate::avm2::Error;
-use gc_arena::barrier::unlock;
 use gc_arena::lock::RefLock;
 use gc_arena::{Collect, Gc, GcWeak, Mutation};
 use ruffle_render::backend::VertexBuffer;
-use std::cell::{Ref, RefMut};
 use std::rc::Rc;
 
 use super::Context3DObject;
diff --git a/core/src/avm2/object/xml_object.rs b/core/src/avm2/object/xml_object.rs
index 31b53ca13..c57c01774 100644
--- a/core/src/avm2/object/xml_object.rs
+++ b/core/src/avm2/object/xml_object.rs
@@ -18,7 +18,6 @@ use gc_arena::{
     Collect, Gc, GcWeak, Mutation,
 };
 use ruffle_wstr::WString;
-use std::cell::{Ref, RefMut};
 
 use super::xml_list_object::{E4XOrXml, XmlOrXmlListObject};
 use super::PrimitiveObject;