Skip to content

MethodInfo (GDExtensionClassMethodInfo) collides with GDExtensionMethodInfo #502

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 27, 2023
Merged

MethodInfo (GDExtensionClassMethodInfo) collides with GDExtensionMethodInfo #502

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions godot-core/src/builtin/meta/registration/method.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ impl MethodParamOrReturnInfo {
}

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

impl MethodInfo {
impl ClassMethodInfo {
/// # Safety
///
/// `ptrcall_func`, if provided, must:
Expand Down
4 changes: 2 additions & 2 deletions godot-macros/src/class/data_models/func.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ pub fn make_method_registration(
#(#cfg_attrs)*
{
use ::godot::obj::GodotClass;
use ::godot::builtin::meta::registration::method::MethodInfo;
use ::godot::builtin::meta::registration::method::ClassMethodInfo;
use ::godot::builtin::{StringName, Variant};
use ::godot::sys;

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