more ergonomic subchildren_of_type generics

pets-lib/src/dialogue/dbox/mod.rs

@@ -428,8 +428,8 @@ impl DialogBox {
     }
 
     fn free_choice_labels(&mut self) {
-        let cont = self.choice_container().upcast();
-        let children = subchildren_of_type::<DChoice>(cont);
+        let cont = self.choice_container();
+        let children = subchildren_of_type::<DChoice, _>(cont);
 
         for mut node in children {
             node.queue_free();

pets-lib/src/util/mod.rs

@@ -21,7 +21,7 @@ where
     Filter: Inherits<Node>,
     N: Inherits<Node>,
 {
-    subchildren_of_type::<Filter>(node.upcast())
+    subchildren_of_type::<Filter, _>(node.upcast())
         .iter()
         .position(|n| n.upcast_ref().get_name() == name.clone().into())
 }
@@ -65,15 +65,17 @@ where
 /// Returns a vector. Use `subchildren_of_type_array` for a godot array.
 ///
 /// bugfix later: it won't find children of nodes that are the correct type
-pub fn subchildren_of_type<T>(parent: Gd<Node>) -> Vec<Gd<T>>
+pub fn subchildren_of_type<T, Par>(parent: Gd<Par>) -> Vec<Gd<T>>
 where
+    Par: Inherits<Node>,
     T: Inherits<Node>,
 {
     let mut res = vec![];
+    let parent = parent.upcast_ref();
 
     for node in parent.get_children().iter_shared() {
         let Ok(node) = node.clone().try_cast::<T>() else {
-            let children = subchildren_of_type::<T>(node);
+            let children = subchildren_of_type::<T, _>(node);
             res.extend(children);
             continue;
         };

pets-lib/src/world/mod.rs

@@ -169,7 +169,7 @@ impl World {
 impl INode2D for World {
     fn ready(&mut self) {
         let room = self.room.clone();
-        let mzones = subchildren_of_type::<MusicZone>(room.upcast());
+        let mzones = subchildren_of_type::<MusicZone, _>(room);
 
         for mut zone in mzones {
             let on_exit = self.base().callable("on_exit");