fix bug with optionals

makspll · makspll · commit ff9c53831336 · 2026-03-09T22:10:06.000Z
diff --git a/crates/bevy_mod_scripting_bindings/src/function/script_function.rs b/crates/bevy_mod_scripting_bindings/src/function/script_function.rs
@@ -616,11 +616,8 @@ fn pop_args_stack_for_arg<A: ArgMeta>(args: &mut VecDeque<ScriptValue>) -> Optio
             return Some(ScriptValue::Tuple(VariadicTuple(std::mem::take(args))));
         }
     }
-    if let Some(default) = A::default_value() {
-        return Some(default);
-    }
 
-    args.pop_front()
+    args.pop_front().or_else(A::default_value)
 }
 
 pub(crate) use count;

Original file line number	Diff line number	Diff line change
`@@ -616,11 +616,8 @@ fn pop_args_stack_for_arg<A: ArgMeta>(args: &mut VecDeque<ScriptValue>) -> Optio`
`616`	`616`	`return Some(ScriptValue::Tuple(VariadicTuple(std::mem::take(args))));`
`617`	`617`	`}`
`618`	`618`	`}`
`619`		`- if let Some(default) = A::default_value() {`
`620`		`- return Some(default);`
`621`		`- }`
`622`	`619`
`623`		`- args.pop_front()`
	`620`	`+ args.pop_front().or_else(A::default_value)`
`624`	`621`	`}`
`625`	`622`
`626`	`623`	`pub(crate) use count;`