excise: Drop Script::asset field.

It's a duplicate with Script::id now.

Author: shanecelis

crates/bevy_mod_scripting_core/src/asset.rs

@@ -173,8 +173,7 @@ pub(crate) fn sync_script_data<P: IntoScriptPluginParams>(
                         info!("{}: Loading static script: {:?}", P::LANGUAGE, id);
                         commands.queue(CreateOrUpdateScript::<P>::new(
                             Handle::Weak(*id),
-                            asset.content.clone(),
-                            Some(script_assets.reserve_handle().clone_weak()),
+                            asset.content.clone(), // Cloning seems bad!
                         ));
                     }
                 }
@@ -228,7 +227,6 @@ pub(crate) fn eval_script<P: IntoScriptPluginParams>(
                     commands.queue(CreateOrUpdateScript::<P>::new(
                         script_id,
                         asset.content.clone(),
-                        None,
                     ));
                 }
             } else {

crates/bevy_mod_scripting_core/src/commands.rs

@@ -67,19 +67,17 @@ impl<P: IntoScriptPluginParams> Command for DeleteScript<P> {
 pub struct CreateOrUpdateScript<P: IntoScriptPluginParams> {
     id: Handle<ScriptAsset>,
     content: Box<[u8]>,
-    asset: Option<Handle<ScriptAsset>>,
     // Hack to make this Send, C does not need to be Send since it is not stored in the command
     _ph: std::marker::PhantomData<fn(P::R, P::C)>,
 }
 
 #[profiling::all_functions]
 impl<P: IntoScriptPluginParams> CreateOrUpdateScript<P> {
     /// Creates a new CreateOrUpdateScript command with the given ID, content and asset
-    pub fn new(id: Handle<ScriptAsset>, content: Box<[u8]>, asset: Option<Handle<ScriptAsset>>) -> Self {
+    pub fn new(id: Handle<ScriptAsset>, content: Box<[u8]>) -> Self {
         Self {
             id,
             content,
-            asset,
             _ph: std::marker::PhantomData,
         }
     }
@@ -145,7 +143,6 @@ impl<P: IntoScriptPluginParams> CreateOrUpdateScript<P> {
         handler_ctxt.scripts.insert(
             Script {
                 id: self.id.clone(),
-                asset: self.asset.clone(),
                 context,
             },
         );
@@ -194,7 +191,6 @@ impl<P: IntoScriptPluginParams> Command for CreateOrUpdateScript<P> {
                             // make a new script with the shared context
                             let script = Script {
                                 id: self.id.clone(),
-                                asset: self.asset.clone(),
                                 context: assigned_shared_context.clone(),
                             };
                             // it can potentially be loaded but without a successful script reload but that

crates/bevy_mod_scripting_core/src/script.rs

@@ -129,9 +129,6 @@ impl<P: IntoScriptPluginParams> Default for Scripts<P> {
 pub struct Script<P: IntoScriptPluginParams> {
     /// The id of the script
     pub id: Handle<ScriptAsset>,
-    /// TODO: Let's remove asset if possible.
-    /// the asset holding the content of the script if it comes from an asset
-    pub asset: Option<Handle<ScriptAsset>>,
     /// The context of the script, possibly shared with other scripts
     pub context: Arc<Mutex<P::C>>,
 }
@@ -140,7 +137,6 @@ impl<P: IntoScriptPluginParams> Clone for Script<P> {
     fn clone(&self) -> Self {
         Self {
             id: self.id.clone(),
-            asset: self.asset.clone(),
             context: self.context.clone(),
         }
     }

crates/testing_crates/script_integration_test_harness/src/lib.rs

@@ -515,7 +515,6 @@ pub fn run_plugin_script_load_benchmark<
                     CreateOrUpdateScript::<P>::new(
                         Handle::Weak(random_script_id),
                         content.clone().into(),
-                        None,
                     ),
                     is_reload,
                 )