Callable: rename arg_len() etc. to their original Godot names

Also consistently return usize (0 lower bound) for get_bound_arguments_count().

Author: Bromeon

godot-core/src/builtin/callable.rs

@@ -307,6 +307,7 @@ impl Callable {
     /// _Godot equivalent: `get_method`_
     ///
     /// [godot#73052]: https://github.com/godotengine/godot/issues/73052
+    #[doc(alias = "get_method")]
     pub fn method_name(&self) -> Option<StringName> {
         let method_name = self.as_inner().get_method();
         if method_name.is_empty() {
@@ -389,14 +390,15 @@ impl Callable {
     }
 
     #[cfg(since_api = "4.3")]
-    #[doc(alias = "get_argument_count")]
-    pub fn arg_len(&self) -> usize {
+    pub fn get_argument_count(&self) -> usize {
         self.as_inner().get_argument_count() as usize
     }
 
-    #[doc(alias = "get_bound_arguments_count")]
-    pub fn bound_args_len(&self) -> i64 {
-        self.as_inner().get_bound_arguments_count()
+    pub fn get_bound_arguments_count(&self) -> usize {
+        // To consistently return usize, we already fix the bug https://github.com/godotengine/godot/pull/98713 before Godot 4.4.
+        let alleged_count = self.as_inner().get_bound_arguments_count();
+
+        alleged_count.max(0) as usize
     }
 
     #[doc(hidden)]

itest/rust/src/builtin_tests/containers/callable_test.rs

@@ -10,7 +10,6 @@ use godot::builtin::{
     array, varray, Array, Callable, GString, NodePath, StringName, Variant, VariantArray,
 };
 use godot::classes::{Node2D, Object, RefCounted};
-use godot::init::GdextBuild;
 use godot::meta::ToGodot;
 use godot::obj::{Gd, NewAlloc, NewGd};
 use godot::register::{godot_api, GodotClass};
@@ -117,7 +116,7 @@ fn callable_static() {
     assert_eq!(result, "12345".to_variant());
 
     #[cfg(since_api = "4.3")]
-    assert_eq!(callable.arg_len(), 0); // Consistently doesn't work :)
+    assert_eq!(callable.get_argument_count(), 0); // Consistently doesn't work :)
 }
 
 #[itest]
@@ -247,37 +246,31 @@ fn callable_unbind() {
 fn callable_arg_len() {
     let obj = CallableTestObj::new_gd();
 
-    assert_eq!(obj.callable("foo").arg_len(), 1);
-    assert_eq!(obj.callable("bar").arg_len(), 1);
-    assert_eq!(obj.callable("baz").arg_len(), 4);
-    assert_eq!(obj.callable("foo").unbind(10).arg_len(), 11);
+    assert_eq!(obj.callable("foo").get_argument_count(), 1);
+    assert_eq!(obj.callable("bar").get_argument_count(), 1);
+    assert_eq!(obj.callable("baz").get_argument_count(), 4);
+    assert_eq!(obj.callable("foo").unbind(10).get_argument_count(), 11);
     assert_eq!(
         obj.callable("baz")
             .bind(&[10.to_variant(), "hello".to_variant()])
-            .arg_len(),
+            .get_argument_count(),
         2
     );
 }
 
 #[itest]
 fn callable_bound_args_len() {
+    // Note: bug regarding get_bound_arguments_count() returning negative numbers has been fixed in godot-rust also for older versions.
+
     let obj = CallableTestObj::new_gd();
+    let original = obj.callable("foo");
 
-    assert_eq!(obj.callable("foo").bound_args_len(), 0);
-    assert_eq!(obj.callable("foo").bindv(&varray![10]).bound_args_len(), 1);
-    #[cfg(since_api = "4.3")]
-    assert_eq!(
-        obj.callable("foo").unbind(28).bound_args_len(),
-        if GdextBuild::since_api("4.4") { 0 } else { -28 }
-    );
-    #[cfg(since_api = "4.3")]
-    assert_eq!(
-        obj.callable("foo")
-            .bindv(&varray![10])
-            .unbind(5)
-            .bound_args_len(),
-        if GdextBuild::since_api("4.4") { 1 } else { -4 }
-    );
+    assert_eq!(original.get_bound_arguments_count(), 0);
+    assert_eq!(original.unbind(28).get_bound_arguments_count(), 0);
+
+    let with_1_arg = original.bindv(&varray![10]);
+    assert_eq!(with_1_arg.get_bound_arguments_count(), 1);
+    assert_eq!(with_1_arg.unbind(5).get_bound_arguments_count(), 1);
 }
 
 #[itest]