core: make Character: Copy

This allows returning them without having to keep a `&MovieLibrary` reference alive.

Author: moulins

core/src/avm1/globals/sound.rs

@@ -197,13 +197,13 @@ fn attach_sound<'gc>(
             .library_for_movie_mut(movie)
             .character_by_export_name(name)
         {
-            sound.set_sound(Some(*sound_handle));
+            sound.set_sound(Some(sound_handle));
             sound.set_is_streaming(false);
             sound.set_duration(
                 activation
                     .context
                     .audio
-                    .get_sound_duration(*sound_handle)
+                    .get_sound_duration(sound_handle)
                     .map(|d| d.round() as u32),
             );
             sound.set_position(0);
@@ -554,7 +554,6 @@ fn stop<'gc>(
                 .character_by_export_name(name)
             {
                 // Stop all sounds with the given name.
-                let sound = *sound;
                 activation.context.stop_sounds_with_handle(sound);
             } else {
                 avm_warn!(activation, "Sound.stop: Sound '{}' not found", name);

core/src/avm2/globals/flash/display/bitmap.rs

@@ -49,7 +49,6 @@ pub fn bitmap_allocator<'gc>(
                 .library
                 .library_for_movie_mut(movie)
                 .character_by_id(symbol)
-                .cloned()
             {
                 let new_bitmap_data = fill_bitmap_data_from_symbol(activation, bitmap.compressed());
                 let bitmap_data_obj = BitmapDataObject::from_bitmap_data_internal(

core/src/avm2/globals/flash/display/bitmap_data.rs

@@ -111,7 +111,6 @@ pub fn init<'gc>(
                 .library
                 .library_for_movie_mut(movie)
                 .character_by_id(chara_id)
-                .cloned()
         });
 
     let new_bitmap_data = if let Some(Character::Bitmap(bitmap)) = character {

core/src/avm2/globals/flash/media/sound.rs

@@ -40,7 +40,6 @@ pub fn init<'gc>(
                 .library_for_movie_mut(movie)
                 .character_by_id(symbol)
             {
-                let sound = *sound;
                 sound_object.set_sound(activation.context, sound)?;
             } else {
                 tracing::warn!("Attempted to construct subclass of Sound, {}, which is associated with non-Sound character {}", class_def.name().local_name(), symbol);

core/src/avm2/globals/flash/text/font.rs

@@ -157,7 +157,7 @@ pub fn register_font<'gc>(
         {
             if let Some(lib) = activation.context.library.library_for_movie(movie) {
                 if let Some(Character::Font(font)) = lib.character_by_id(id) {
-                    activation.context.library.register_global_font(*font);
+                    activation.context.library.register_global_font(font);
                     return Ok(Value::Undefined);
                 }
             }

core/src/avm2/object/bytearray_object.rs

@@ -26,7 +26,7 @@ pub fn byte_array_allocator<'gc>(
         if let Some(lib) = activation.context.library.library_for_movie(movie) {
             if let Some(Character::BinaryData(binary_data)) = lib.character_by_id(id) {
                 Some(ByteArrayStorage::from_vec(
-                    SwfSlice::as_ref(binary_data).to_vec(),
+                    SwfSlice::as_ref(&binary_data).to_vec(),
                 ))
             } else {
                 None

core/src/avm2/object/font_object.rs

@@ -22,7 +22,7 @@ pub fn font_allocator<'gc>(
     {
         if let Some(lib) = activation.context.library.library_for_movie(movie) {
             if let Some(Character::Font(font)) = lib.character_by_id(id) {
-                Some(*font)
+                Some(font)
             } else {
                 None
             }

core/src/character.rs

@@ -14,7 +14,7 @@ use ruffle_render::bitmap::{Bitmap as RenderBitmap, BitmapHandle, BitmapSize};
 use ruffle_render::error::Error as RenderError;
 use swf::DefineBitsLossless;
 
-#[derive(Clone, Collect, Debug)]
+#[derive(Copy, Clone, Collect, Debug)]
 #[collect(no_drop)]
 pub enum Character<'gc> {
     EditText(EditText<'gc>),

core/src/debug_ui/movie.rs

@@ -125,7 +125,7 @@ impl MovieWindow {
                 sorted_keys.sort();
 
                 for id in sorted_keys {
-                    let character = characters
+                    let character = *characters
                         .get(&id)
                         .expect("Value must exist as we're iterating known keys");
 
@@ -256,7 +256,7 @@ pub fn open_movie_button(ui: &mut Ui, movie: &Arc<SwfMovie>, messages: &mut Vec<
     }
 }
 
-pub fn open_character_button(ui: &mut Ui, character: &Character) {
+pub fn open_character_button(ui: &mut Ui, character: Character) {
     let name = match character {
         Character::EditText(_) => "EditText",
         Character::Graphic(_) => "Graphic",

core/src/display_object/movie_clip.rs

@@ -3687,7 +3687,7 @@ impl<'gc, 'a> MovieClipShared<'gc> {
             .iter()
             .map(|(name, id)| {
                 let character = importer_library.character_by_id(*id).unwrap();
-                (name, (*id, character.clone()))
+                (name, (*id, character))
             })
             .collect::<HashMap<AvmString<'gc>, (CharacterId, Character<'gc>)>>();
 
@@ -3819,7 +3819,6 @@ impl<'gc, 'a> MovieClipShared<'gc> {
             if let Some(character) = self
                 .library(context)
                 .and_then(|l| l.character_by_id(export.id))
-                .cloned()
             {
                 Self::register_export(context, export.id, &name, self.movie());
                 tracing::debug!("register_export asset: {} (ID: {})", name, export.id);
@@ -4131,7 +4130,7 @@ impl<'gc, 'a> MovieClip<'gc> {
                                         .library
                                         .library_for_movie_mut(movie.clone());
 
-                                    let Some(&Character::Bitmap(bitmap)) =
+                                    let Some(Character::Bitmap(bitmap)) =
                                         library.character_by_id(id)
                                     else {
                                         unreachable!();