Fixes for newer clippy

src/script_implementations/wasm/extern_ref.rs

@@ -24,10 +24,7 @@ impl<T: ?Sized> Copy for ExternRef<T> {}
 
 impl<T: ?Sized> Clone for ExternRef<T> {
     fn clone(&self) -> Self {
-        Self {
-            index: self.index,
-            _phantom: Default::default(),
-        }
+        *self
     }
 }
 
@@ -148,11 +145,7 @@ pub(crate) struct VecExternRef<T> {
 
 impl<T> Clone for VecExternRef<T> {
     fn clone(&self) -> Self {
-        Self {
-            index: self.index,
-            size: self.size,
-            _phantom: Default::default(),
-        }
+        *self
     }
 }
 

src/script_implementations/wasm/script.rs

@@ -314,7 +314,6 @@ impl Script for WebAssemblyScript {
         let env = &self.environment;
         if let Some(func) = env.script_function_cache().change_move_type(env) {
             let ptr = env.allocate_temp::<TypeIdentifier>(*move_type);
-            let target = target;
             let w_ptr = ptr.wasm_ptr;
             call_func!(func, env, self, ex_ref!(env, mv), ex_ref!(env, target), hit, w_ptr);
             *move_type = *ptr.value();
@@ -335,7 +334,6 @@ impl Script for WebAssemblyScript {
         let env = &self.environment;
         if let Some(func) = env.script_function_cache().change_effectiveness(env) {
             let ptr = env.allocate_temp(*effectiveness);
-            let target = target;
             let w_ptr = ptr.wasm_ptr;
             call_func!(func, env, self, ex_ref!(env, mv), ex_ref!(env, target), hit, w_ptr);
             *effectiveness = *ptr.value();
@@ -356,7 +354,6 @@ impl Script for WebAssemblyScript {
         let env = &self.environment;
         if let Some(func) = env.script_function_cache().block_critical(env) {
             let ptr = env.allocate_temp(*block_critical);
-            let target = target;
             let w_ptr = ptr.wasm_ptr;
             call_func!(func, env, self, ex_ref!(env, mv), ex_ref!(env, target), hit, w_ptr);
             *block_critical = *ptr.value();
@@ -377,7 +374,6 @@ impl Script for WebAssemblyScript {
         let env = &self.environment;
         if let Some(func) = env.script_function_cache().block_incoming_critical(env) {
             let ptr = env.allocate_temp(*block_critical);
-            let target = target;
             let w_ptr = ptr.wasm_ptr;
             call_func!(func, env, self, ex_ref!(env, mv), ex_ref!(env, target), hit, w_ptr);
             *block_critical = *ptr.value();
@@ -392,7 +388,6 @@ impl Script for WebAssemblyScript {
         let env = &self.environment;
         if let Some(func) = env.script_function_cache().change_accuracy(env) {
             let ptr = env.allocate_temp(*accuracy);
-            let target = target;
             let w_ptr = ptr.wasm_ptr;
             call_func!(func, env, self, ex_ref!(env, mv), ex_ref!(env, target), hit, w_ptr);
             *accuracy = *ptr.value();
@@ -407,7 +402,6 @@ impl Script for WebAssemblyScript {
         let env = &self.environment;
         if let Some(func) = env.script_function_cache().change_critical_stage(env) {
             let ptr = env.allocate_temp(*stage);
-            let target = target;
             let w_ptr = ptr.wasm_ptr;
             call_func!(func, env, self, ex_ref!(env, mv), ex_ref!(env, target), hit, w_ptr);
             *stage = *ptr.value();
@@ -428,7 +422,6 @@ impl Script for WebAssemblyScript {
         let env = &self.environment;
         if let Some(func) = env.script_function_cache().change_critical_modifier(env) {
             let ptr = env.allocate_temp(*modifier);
-            let target = target;
             let w_ptr = ptr.wasm_ptr;
             call_func!(func, env, self, ex_ref!(env, mv), ex_ref!(env, target), hit, w_ptr);
             *modifier = *ptr.value();
@@ -449,7 +442,6 @@ impl Script for WebAssemblyScript {
         let env = &self.environment;
         if let Some(func) = env.script_function_cache().change_stab_modifier(env) {
             let ptr = env.allocate_temp(*modifier);
-            let target = target;
             let w_ptr = ptr.wasm_ptr;
             call_func!(func, env, self, ex_ref!(env, mv), ex_ref!(env, target), hit, w_ptr);
             *modifier = *ptr.value();
@@ -464,7 +456,6 @@ impl Script for WebAssemblyScript {
         let env = &self.environment;
         if let Some(func) = env.script_function_cache().change_base_power(env) {
             let ptr = env.allocate_temp(*base_power);
-            let target = target;
             let w_ptr = ptr.wasm_ptr;
             call_func!(func, env, self, ex_ref!(env, mv), ex_ref!(env, target), hit, w_ptr);
             *base_power = *ptr.value();
@@ -485,7 +476,6 @@ impl Script for WebAssemblyScript {
         let env = &self.environment;
         if let Some(func) = env.script_function_cache().bypass_defensive_stat_boost(env) {
             let ptr = env.allocate_temp(*bypass);
-            let target = target;
             let w_ptr = ptr.wasm_ptr;
             call_func!(func, env, self, ex_ref!(env, mv), ex_ref!(env, target), hit, w_ptr);
             *bypass = *ptr.value();
@@ -506,7 +496,6 @@ impl Script for WebAssemblyScript {
         let env = &self.environment;
         if let Some(func) = env.script_function_cache().bypass_offensive_stat_boost(env) {
             let ptr = env.allocate_temp(*bypass);
-            let target = target;
             let w_ptr = ptr.wasm_ptr;
             call_func!(func, env, self, ex_ref!(env, mv), ex_ref!(env, target), hit, w_ptr);
             *bypass = *ptr.value();
@@ -527,7 +516,6 @@ impl Script for WebAssemblyScript {
         let env = &self.environment;
         if let Some(func) = env.script_function_cache().change_offensive_stat_value(env) {
             let ptr = env.allocate_temp(*amount);
-            let target = target;
             let w_ptr = ptr.wasm_ptr;
             call_func!(func, env, self, ex_ref!(env, mv), ex_ref!(env, target), hit, w_ptr);
             *amount = *ptr.value();
@@ -548,7 +536,6 @@ impl Script for WebAssemblyScript {
         let env = &self.environment;
         if let Some(func) = env.script_function_cache().change_defensive_stat_value(env) {
             let ptr = env.allocate_temp(*amount);
-            let target = target;
             let w_ptr = ptr.wasm_ptr;
             call_func!(func, env, self, ex_ref!(env, mv), ex_ref!(env, target), hit, w_ptr);
             *amount = *ptr.value();
@@ -569,7 +556,6 @@ impl Script for WebAssemblyScript {
         let env = &self.environment;
         if let Some(func) = env.script_function_cache().change_damage_stat_modifier(env) {
             let ptr = env.allocate_temp(*modifier);
-            let target = target;
             let w_ptr = ptr.wasm_ptr;
             call_func!(func, env, self, ex_ref!(env, mv), ex_ref!(env, target), hit, w_ptr);
             *modifier = *ptr.value();
@@ -590,7 +576,6 @@ impl Script for WebAssemblyScript {
         let env = &self.environment;
         if let Some(func) = env.script_function_cache().change_damage_modifier(env) {
             let ptr = env.allocate_temp(*modifier);
-            let target = target;
             let w_ptr = ptr.wasm_ptr;
             call_func!(func, env, self, ex_ref!(env, mv), ex_ref!(env, target), hit, w_ptr);
             *modifier = *ptr.value();
@@ -605,7 +590,6 @@ impl Script for WebAssemblyScript {
         let env = &self.environment;
         if let Some(func) = env.script_function_cache().change_damage(env) {
             let ptr = env.allocate_temp(*damage);
-            let target = target;
             let w_ptr = ptr.wasm_ptr;
             call_func!(func, env, self, ex_ref!(env, mv), ex_ref!(env, target), hit, w_ptr);
             *damage = *ptr.value();
@@ -626,7 +610,6 @@ impl Script for WebAssemblyScript {
         let env = &self.environment;
         if let Some(func) = env.script_function_cache().change_incoming_damage(env) {
             let ptr = env.allocate_temp(*damage);
-            let target = target;
             let w_ptr = ptr.wasm_ptr;
             call_func!(func, env, self, ex_ref!(env, mv), ex_ref!(env, target), hit, w_ptr);
             *damage = *ptr.value();
@@ -640,7 +623,6 @@ impl Script for WebAssemblyScript {
         }
         let env = &self.environment;
         if let Some(func) = env.script_function_cache().on_incoming_hit(env) {
-            let target = target;
             call_func!(func, env, self, ex_ref!(env, mv), ex_ref!(env, target), hit);
         }
         Ok(())
@@ -652,7 +634,6 @@ impl Script for WebAssemblyScript {
         }
         let env = &self.environment;
         if let Some(func) = env.script_function_cache().on_opponent_faints(env) {
-            let target = target;
             call_func!(func, env, self, ex_ref!(env, mv), ex_ref!(env, target), hit);
         }
         Ok(())
@@ -701,7 +682,6 @@ impl Script for WebAssemblyScript {
         let env = &self.environment;
         if let Some(func) = env.script_function_cache().prevent_secondary_effect(env) {
             let ptr = env.allocate_temp(*prevent);
-            let target = target;
             let w_ptr = ptr.wasm_ptr;
             call_func!(func, env, self, ex_ref!(env, mv), ex_ref!(env, target), hit, w_ptr);
             *prevent = *ptr.value();
@@ -716,7 +696,6 @@ impl Script for WebAssemblyScript {
         let env = &self.environment;
         if let Some(func) = env.script_function_cache().change_effect_chance(env) {
             let ptr = env.allocate_temp(*chance);
-            let target = target;
             let w_ptr = ptr.wasm_ptr;
             call_func!(func, env, self, ex_ref!(env, mv), ex_ref!(env, target), hit, w_ptr);
             *chance = *ptr.value();
@@ -737,7 +716,6 @@ impl Script for WebAssemblyScript {
         let env = &self.environment;
         if let Some(func) = env.script_function_cache().change_incoming_effect_chance(env) {
             let ptr = env.allocate_temp(*chance);
-            let target = target;
             let w_ptr = ptr.wasm_ptr;
             call_func!(func, env, self, ex_ref!(env, mv), ex_ref!(env, target), hit, w_ptr);
             *chance = *ptr.value();
@@ -751,7 +729,6 @@ impl Script for WebAssemblyScript {
         }
         let env = &self.environment;
         if let Some(func) = env.script_function_cache().on_secondary_effect(env) {
-            let target = target;
             call_func!(func, env, self, ex_ref!(env, mv), ex_ref!(env, target), hit);
         }
         Ok(())
@@ -763,7 +740,6 @@ impl Script for WebAssemblyScript {
         }
         let env = &self.environment;
         if let Some(func) = env.script_function_cache().on_after_hits(env) {
-            let target = target;
             call_func!(func, env, self, ex_ref!(env, mv), ex_ref!(env, target));
         }
         Ok(())

src/script_implementations/wasm/script_function_cache.rs

@@ -81,10 +81,7 @@ pub(super) struct WasmPtr<T> {
 
 impl<T> Clone for WasmPtr<T> {
     fn clone(&self) -> Self {
-        Self {
-            v: self.v,
-            _phantom: Default::default(),
-        }
+        *self
     }
 }