Skip to content

Commit 786a994

Browse files
authored
Merge pull request #502 from TitanNano/jovan/rename_method_info
`MethodInfo` (`GDExtensionClassMethodInfo`) collides with `GDExtensionMethodInfo`
2 parents 6b99bc9 + edd4d25 commit 786a994

File tree

2 files changed

+4
-4
lines changed
  • godot-core/src/builtin/meta/registration
  • godot-macros/src/class/data_models

2 files changed

+4
-4
lines changed

godot-core/src/builtin/meta/registration/method.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ impl MethodParamOrReturnInfo {
2424
}
2525

2626
/// All info needed to register a method for a class with Godot.
27-
pub struct MethodInfo {
27+
pub struct ClassMethodInfo {
2828
class_name: ClassName,
2929
method_name: StringName,
3030
call_func: sys::GDExtensionClassMethodCall,
@@ -35,7 +35,7 @@ pub struct MethodInfo {
3535
default_arguments: Vec<Variant>,
3636
}
3737

38-
impl MethodInfo {
38+
impl ClassMethodInfo {
3939
/// # Safety
4040
///
4141
/// `ptrcall_func`, if provided, must:

godot-macros/src/class/data_models/func.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ pub fn make_method_registration(
9090
#(#cfg_attrs)*
9191
{
9292
use ::godot::obj::GodotClass;
93-
use ::godot::builtin::meta::registration::method::MethodInfo;
93+
use ::godot::builtin::meta::registration::method::ClassMethodInfo;
9494
use ::godot::builtin::{StringName, Variant};
9595
use ::godot::sys;
9696

@@ -105,7 +105,7 @@ pub fn make_method_registration(
105105
// `get_varcall_func` upholds all the requirements for `call_func`.
106106
// `get_ptrcall_func` upholds all the requirements for `ptrcall_func`
107107
let method_info = unsafe {
108-
MethodInfo::from_signature::<Sig>(
108+
ClassMethodInfo::from_signature::<Sig>(
109109
#class_name::class_name(),
110110
method_name,
111111
Some(varcall_func),

0 commit comments

Comments
 (0)