fix ToGodot todo

godot-rust · Sep 22, 2024 · 3a716d6 · 3a716d6
1 parent 1750a45
commit 3a716d6
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 7 deletions.
diff --git a/godot-core/src/meta/ref_arg.rs b/godot-core/src/meta/ref_arg.rs
@@ -48,10 +48,11 @@ where
  where Self: 'v;
 
  fn to_godot(&self) -> Self::ToVia<'_> {
- match self.shared_ref {
- Some(r) => r.to_godot(),
- None => todo!("implement mapping of RefArg(RawGd<T>).to_godot()"),
- }
+ let shared_ref = self
+ .shared_ref
+ .expect("Objects are currently mapped through ObjectArg; RefArg shouldn't be null");
+
+ shared_ref.to_godot()
  }
 }
 

diff --git a/itest/rust/src/object_tests/object_test.rs b/itest/rust/src/object_tests/object_test.rs
@@ -98,15 +98,18 @@ fn object_engine_roundtrip() {
  obj.free();
 }
 
-#[itest(focus)]
+#[itest]
 fn object_null_argument() {
+ // Objects currently use ObjectArg instead of RefArg, so this scenario shouldn't occur. Test can be updated if code is refactored.
+
  let null_obj = Option::<Gd<Node>>::None;
 
  let via = null_obj.to_godot();
  let ffi = via.to_ffi();
- //dbg!(ffi);
 
- ffi.to_godot();
+ expect_panic("not yet implemented: pass objects through RefArg", || {
+ ffi.to_godot();
+ });
 }
 
 #[itest]