tighten codegen ordering

Author: makspll

crates/bevy_api_gen/src/passes/populate_template_data.rs

@@ -32,7 +32,19 @@ pub(crate) fn populate_template_data(ctxt: &mut BevyCtxt<'_>, args: &Args) -> bo
         let has_static_methods = fn_ctxts.iter().any(|fn_ctxt| !fn_ctxt.has_self);
 
         let mut functions = process_functions(ctxt, fn_ctxts);
-        functions.sort_by(|a, b| a.ident.cmp(&b.ident));
+        functions.sort_by(|a, b| {
+            a.ident
+                .cmp(&b.ident)
+                .then(a.args.len().cmp(&b.args.len()))
+                .then(
+                    a.args
+                        .iter()
+                        .zip(b.args.iter())
+                        .fold(std::cmp::Ordering::Equal, |acc, (a, b)| {
+                            acc.then(a.ty.cmp(&b.ty))
+                        }),
+                )
+        });
 
         let variant = ty_ctxt.variant_data.as_ref().unwrap();
 

crates/bevy_mod_scripting_functions/src/bevy_bindings/bevy_math.rs

@@ -212,22 +212,22 @@ impl ::bevy::app::Plugin for BevyMathScriptingPlugin {
             )
             .register(
                 "mul",
-                |
-                    _self: Val<bevy::math::Isometry2d>,
-                    rhs: Val<bevy::math::prelude::Dir2>|
-                {
-                    let output: Val<bevy::math::prelude::Dir2> = <bevy::math::Isometry2d as std::ops::Mul<
-                        bevy::math::prelude::Dir2,
+                |_self: Val<bevy::math::Isometry2d>, rhs: Val<bevy::math::Isometry2d>| {
+                    let output: Val<bevy::math::Isometry2d> = <bevy::math::Isometry2d as std::ops::Mul<
+                        bevy::math::Isometry2d,
                     >>::mul(_self.into_inner(), rhs.into_inner())
                         .into();
                     output
                 },
             )
             .register(
                 "mul",
-                |_self: Val<bevy::math::Isometry2d>, rhs: Val<bevy::math::Isometry2d>| {
-                    let output: Val<bevy::math::Isometry2d> = <bevy::math::Isometry2d as std::ops::Mul<
-                        bevy::math::Isometry2d,
+                |
+                    _self: Val<bevy::math::Isometry2d>,
+                    rhs: Val<bevy::math::prelude::Dir2>|
+                {
+                    let output: Val<bevy::math::prelude::Dir2> = <bevy::math::Isometry2d as std::ops::Mul<
+                        bevy::math::prelude::Dir2,
                     >>::mul(_self.into_inner(), rhs.into_inner())
                         .into();
                     output
@@ -524,6 +524,16 @@ impl ::bevy::app::Plugin for BevyMathScriptingPlugin {
                     output
                 },
             )
+            .register(
+                "mul",
+                |_self: Val<bevy::math::Rot2>, rhs: Val<bevy::math::Rot2>| {
+                    let output: Val<bevy::math::Rot2> = <bevy::math::Rot2 as std::ops::Mul<
+                        bevy::math::Rot2,
+                    >>::mul(_self.into_inner(), rhs.into_inner())
+                        .into();
+                    output
+                },
+            )
             .register(
                 "mul",
                 |
@@ -537,16 +547,6 @@ impl ::bevy::app::Plugin for BevyMathScriptingPlugin {
                     output
                 },
             )
-            .register(
-                "mul",
-                |_self: Val<bevy::math::Rot2>, rhs: Val<bevy::math::Rot2>| {
-                    let output: Val<bevy::math::Rot2> = <bevy::math::Rot2 as std::ops::Mul<
-                        bevy::math::Rot2,
-                    >>::mul(_self.into_inner(), rhs.into_inner())
-                        .into();
-                    output
-                },
-            )
             .register(
                 "nlerp",
                 |_self: Val<bevy::math::Rot2>, end: Val<bevy::math::Rot2>, s: f32| {