chore: Resolve review comments and appease clippy

Author: Lord-McSweeney

core/src/avm1/globals/color.rs

@@ -166,7 +166,7 @@ fn set_transform<'gc>(
         out: &mut Fixed8,
     ) -> Result<(), Error<'gc>> {
         // The parameters are set only if the property exists on the object itself (prototype excluded).
-        if transform.has_own_property(activation, property.into()) {
+        if transform.has_own_property(activation, property) {
             let n = transform
                 .get(property, activation)?
                 .coerce_to_f64(activation)?;
@@ -184,7 +184,7 @@ fn set_transform<'gc>(
         out: &mut i16,
     ) -> Result<(), Error<'gc>> {
         // The parameters are set only if the property exists on the object itself (prototype excluded).
-        if transform.has_own_property(activation, property.into()) {
+        if transform.has_own_property(activation, property) {
             *out = transform
                 .get(property, activation)?
                 .coerce_to_i16(activation)?;

core/src/avm1/object/array_object.rs

@@ -63,7 +63,7 @@ impl<'gc> ArrayObject<'gc> {
         Self::builder_with_proto(&activation.context.strings, proto)
     }
 
-    pub fn builder_with_proto<'a>(
+    pub fn builder_with_proto(
         context: &StringContext<'gc>,
         proto: Object<'gc>,
     ) -> ArrayBuilder<'gc> {

core/src/avm1/runtime.rs

@@ -590,6 +590,8 @@ pub fn root_error_handler<'gc>(activation: &mut Activation<'_, 'gc>, error: Erro
             if let Ok(message) = value.coerce_to_string(activation) {
                 activation.context.avm_trace(&message.to_utf8_lossy());
             } else {
+                // The only Value variant that can throw an error when being stringified
+                // is Object, so just print "[type Object]".
                 activation.context.avm_trace("[type Object]");
             }
             // Continue execution without halting.

core/src/backend/audio.rs

@@ -4,10 +4,10 @@ use crate::{
     buffer::Substream,
     context::UpdateContext,
     display_object::{self, DisplayObject, MovieClip, TDisplayObject},
+    string::AvmString,
 };
 use downcast_rs::Downcast;
 use gc_arena::Collect;
-use ruffle_macros::istr;
 use slotmap::{new_key_type, Key, SlotMap};
 
 #[cfg(feature = "audio")]
@@ -380,14 +380,13 @@ impl<'gc> AudioManager<'gc> {
 
     /// Update state of active sounds. Should be called once per frame.
     pub fn update_sounds(context: &mut UpdateContext<'gc>) {
+        let mc = context.gc();
+
         // We can't use 'context' to construct an event inside the
         // 'retain()' closure, so we queue the events up here, and fire
         // them after running 'retain()'
         let mut event_targets = Vec::new();
 
-        // We need to declare this up here to avoid borrow-checker issues
-        let on_sound_complete_string = istr!(context, "onSoundComplete");
-
         // Update the position of sounds, and remove any completed sounds.
         context.audio_manager.sounds.retain(|sound| {
             if let Some(pos) = context.audio.get_sound_position(sound.instance) {
@@ -413,11 +412,13 @@ impl<'gc> AudioManager<'gc> {
 
                     // Fire soundComplete event.
                     if let Some(root) = context.stage.root_clip() {
+                        let method_name = AvmString::new_utf8(mc, "onSoundComplete");
+
                         context.action_queue.queue_action(
                             root,
                             crate::context::ActionType::Method {
                                 object,
-                                name: on_sound_complete_string,
+                                name: method_name,
                                 args: vec![],
                             },
                             false,

core/src/display_object/interactive.rs

@@ -17,6 +17,7 @@ use crate::display_object::{
     DisplayObject, DisplayObjectBase, TDisplayObject, TDisplayObjectContainer,
 };
 use crate::events::{ClipEvent, ClipEventResult, MouseButton};
+use crate::string::AvmString;
 use bitflags::bitflags;
 use gc_arena::{Collect, Mutation};
 use ruffle_macros::{enum_trait_object, istr};
@@ -607,11 +608,13 @@ pub trait TInteractiveObject<'gc>:
             let other = other
                 .map(|d| d.as_displayobject().object())
                 .unwrap_or(Avm1Value::Null);
+
             let method_name = if focused {
-                istr!(context, "onSetFocus")
+                AvmString::new_utf8(context.gc(), "onSetFocus")
             } else {
-                istr!(context, "onKillFocus")
+                AvmString::new_utf8(context.gc(), "onKillFocus")
             };
+
             Avm1::run_stack_frame_for_method(self_do, object, method_name, &[other], context);
         } else if let Avm2Value::Object(object) = self_do.object2() {
             let mut activation = Avm2Activation::from_nothing(context);

core/src/loader.rs

@@ -2534,14 +2534,16 @@ impl<'gc> Loader<'gc> {
         match vm_data {
             MovieLoaderVMData::Avm1 { broadcaster } => {
                 if let Some(broadcaster) = broadcaster {
+                    let error_message = AvmString::new_utf8(uc.gc(), "LoadNeverCompleted");
+
                     Avm1::run_stack_frame_for_method(
                         clip,
                         broadcaster,
                         istr!(uc, "broadcastMessage"),
                         &[
                             istr!(uc, "onLoadError").into(),
                             clip.object(),
-                            istr!(uc, "LoadNeverCompleted").into(),
+                            error_message.into(),
                         ],
                         uc,
                     );

core/src/string/common.rs

@@ -147,7 +147,6 @@ define_common_strings! {
     str_littleEndian: b"littleEndian",
     str_ll: b"ll",
     str_loaded: b"loaded",
-    str_LoadNeverCompleted: b"LoadNeverCompleted",
     str_localhost: b"localhost",
     str_localName: b"localName",
     str_loop: b"loop",
@@ -190,7 +189,6 @@ define_common_strings! {
     str_onHTTPStatus: b"onHTTPStatus",
     str_onKeyDown: b"onKeyDown",
     str_onKeyUp: b"onKeyUp",
-    str_onKillFocus: b"onKillFocus",
     str_onLoad: b"onLoad",
     str_onLoadComplete: b"onLoadComplete",
     str_onLoadError: b"onLoadError",
@@ -207,7 +205,6 @@ define_common_strings! {
     str_onScroller: b"onScroller",
     str_onSelect: b"onSelect",
     str_onSetFocus: b"onSetFocus",
-    str_onSoundComplete: b"onSoundComplete",
     str_onStatus: b"onStatus",
     str_onUnload: b"onUnload",
     str_onXML: b"onXML",