Merge pull request #990 from godot-rust/qol/callable-cleanup

Clean up `Callable` + tests, fix `check.sh test`

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() {
@@ -384,19 +385,28 @@ impl Callable {
         self.as_inner().is_valid()
     }
 
+    /// Returns a copy of the callable, ignoring `args` user arguments.
+    ///
+    /// Despite its name, this does **not** directly undo previous `bind()` calls. See
+    /// [Godot docs](https://docs.godotengine.org/en/latest/classes/class_callable.html#class-callable-method-unbind) for up-to-date semantics.
     pub fn unbind(&self, args: usize) -> Callable {
         self.as_inner().unbind(args as i64)
     }
 
     #[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()
+    /// Get number of bound arguments.
+    ///
+    /// Note: for Godot < 4.4, this function returns incorrect results when applied on a callable that used `unbind()`.
+    /// See [#98713](https://github.com/godotengine/godot/pull/98713) for details.
+    pub fn get_bound_arguments_count(&self) -> usize {
+        // This does NOT fix the bug before Godot 4.4, just cap it at zero. unbind() will still erroneously decrease the bound arguments count.
+        let alleged_count = self.as_inner().get_bound_arguments_count();
+
+        alleged_count.max(0) as usize
     }
 
     #[doc(hidden)]

godot-macros/src/lib.rs

@@ -710,10 +710,23 @@ pub fn derive_godot_class(input: TokenStream) -> TokenStream {
 /// `#[rpc]` implies `#[func]`. You can use both attributes together, if you need to configure other `#[func]`-specific keys.
 ///
 /// For example, the following method declarations are all equivalent:
-/// ```
+/// ```no_run
+/// # // Polyfill without full codegen.
+/// # #![allow(non_camel_case_types)]
+/// # #[cfg(not(feature = "codegen-full"))]
+/// # enum RpcMode { DISABLED, ANY_PEER, AUTHORITY }
+/// # #[cfg(not(feature = "codegen-full"))]
+/// # enum TransferMode { UNRELIABLE, UNRELIABLE_ORDERED, RELIABLE }
+/// # #[cfg(not(feature = "codegen-full"))]
+/// # pub struct RpcConfig { pub rpc_mode: RpcMode, pub transfer_mode: TransferMode, pub call_local: bool, pub channel: u32 }
+/// # #[cfg(not(feature = "codegen-full"))]
+/// # impl Default for RpcConfig { fn default() -> Self { todo!("never called") } }
+/// # #[cfg(feature = "codegen-full")]
 /// use godot::classes::multiplayer_api::RpcMode;
+/// # #[cfg(feature = "codegen-full")]
 /// use godot::classes::multiplayer_peer::TransferMode;
 /// use godot::prelude::*;
+/// # #[cfg(feature = "codegen-full")]
 /// use godot::register::RpcConfig;
 ///
 /// # #[derive(GodotClass)]