Skip to content

Commit 0942641

Browse files
committed
Attempt at fixing RID return type
1 parent 257552b commit 0942641

File tree

1 file changed

+3
-6
lines changed

1 file changed

+3
-6
lines changed

bindings_generator/src/methods.rs

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -455,6 +455,7 @@ fn generate_return_pre(w: &mut impl Write, ty: &Ty) -> GeneratorResult {
455455
| &Ty::ColorArray
456456
| &Ty::Int32Array
457457
| &Ty::Float32Array
458+
| &Ty::Rid
458459
=> {
459460
writeln!(w, r#"
460461
let mut ret = {sys_ty}::default();
@@ -463,7 +464,7 @@ fn generate_return_pre(w: &mut impl Write, ty: &Ty) -> GeneratorResult {
463464
)?;
464465
}
465466
&Ty::Object(_) // TODO: double check
466-
| &Ty::Rid => {
467+
=> {
467468
writeln!(w, r#"
468469
let mut ret: *mut sys::godot_object = ptr::null_mut();
469470
let ret_ptr = (&mut ret) as *mut _;"#
@@ -518,11 +519,7 @@ fn generate_return_post(w: &mut impl Write, ty: &Ty) -> GeneratorResult {
518519
&Ty::Rid => {
519520
writeln!(
520521
w,
521-
r#"
522-
let mut rid = Rid::default();
523-
(gd_api.godot_rid_new_with_resource)(rid.mut_sys(), ret);
524-
525-
rid"#
522+
r#" Rid::from_sys(ret)"#
526523
)?;
527524
}
528525
&Ty::String

0 commit comments

Comments
 (0)