Revert occurrences of *Virtual -> GodotExt

godot-rust · Mar 19, 2023 · be2cb28 · be2cb28
1 parent b15b5d4
commit be2cb28
Show file tree

Hide file tree

Showing 10 changed files with 16 additions and 11 deletions.
diff --git a/examples/dodge-the-creeps/rust/src/hud.rs b/examples/dodge-the-creeps/rust/src/hud.rs
@@ -61,7 +61,7 @@ impl Hud {
 }
 
 #[godot_api]
-impl CanvasLayerVirtual for Hud {
+impl GodotExt for Hud {
     fn init(base: Base<Self::Base>) -> Self {
         Self { base }
     }

diff --git a/examples/dodge-the-creeps/rust/src/main_scene.rs b/examples/dodge-the-creeps/rust/src/main_scene.rs
@@ -126,7 +126,7 @@ impl Main {
 }
 
 #[godot_api]
-impl NodeVirtual for Main {
+impl GodotExt for Main {
     fn init(base: Base<Node>) -> Self {
         Main {
             mob_scene: PackedScene::new(),

diff --git a/examples/dodge-the-creeps/rust/src/mob.rs b/examples/dodge-the-creeps/rust/src/mob.rs
@@ -47,7 +47,7 @@ impl Mob {
 }
 
 #[godot_api]
-impl RigidBody2DVirtual for Mob {
+impl GodotExt for Mob {
     fn init(base: Base<RigidBody2D>) -> Self {
         Mob {
             min_speed: 150.0,

diff --git a/examples/dodge-the-creeps/rust/src/player.rs b/examples/dodge-the-creeps/rust/src/player.rs
@@ -42,7 +42,7 @@ impl Player {
 }
 
 #[godot_api]
-impl Area2DVirtual for Player {
+impl GodotExt for Player {
     fn init(base: Base<Area2D>) -> Self {
         Player {
             speed: 400.0,

diff --git a/godot-core/src/obj/traits.rs b/godot-core/src/obj/traits.rs
@@ -50,6 +50,9 @@ pub trait Share {
     fn share(&self) -> Self;
 }
 
+// Marker trait that exists only for documentation purposes.
+// pub trait GodotExt : private::Sealed {}
+
 /// Non-strict inheritance relationship in the Godot class hierarchy.
 ///
 /// `Derived: Inherits<Base>` means that either `Derived` is a subclass of `Base`, or the class `Base` itself (hence "non-strict").
@@ -164,7 +167,7 @@ pub mod cap {
         fn __register_exports();
     }
 
-    /// Auto-implemented for `#[godot_api] impl ***Virtual for MyClass` blocks
+    /// Auto-implemented for `#[godot_api] impl GodotExt for MyClass` blocks
     pub trait ImplementsGodotVirtual: GodotClass {
         #[doc(hidden)]
         fn __virtual_call(_name: &str) -> sys::GDExtensionClassCallVirtual;

diff --git a/godot-macros/src/lib.rs b/godot-macros/src/lib.rs
@@ -21,6 +21,8 @@ pub fn derive_native_class(input: TokenStream) -> TokenStream {
     translate(input, derive_godot_class::transform)
 }
 
+/// Attribute to annotate `impl` blocks.
+#[doc(alias="GodotExt")]
 #[proc_macro_attribute]
 pub fn godot_api(_meta: TokenStream, input: TokenStream) -> TokenStream {
     translate(input, godot_api::transform)

diff --git a/itest/rust/src/codegen_test.rs b/itest/rust/src/codegen_test.rs
@@ -60,7 +60,7 @@ pub struct TestBaseRenamed {
 }
 
 #[godot_api]
-impl HttpRequestVirtual for TestBaseRenamed {
+impl GodotExt for TestBaseRenamed {
     fn init(base: Base<HttpRequest>) -> Self {
         TestBaseRenamed { base }
     }

diff --git a/itest/rust/src/export_test.rs b/itest/rust/src/export_test.rs
@@ -75,7 +75,7 @@ impl HasProperty {
 }
 
 #[godot_api]
-impl NodeVirtual for HasProperty {
+impl GodotExt for HasProperty {
     fn init(base: Base<Node>) -> Self {
         HasProperty {
             int_val: 0,

diff --git a/itest/rust/src/object_test.rs b/itest/rust/src/object_test.rs
@@ -637,7 +637,7 @@ pub struct ObjPayload {
 }
 
 #[godot_api]
-impl RefCountedVirtual for ObjPayload {
+impl GodotExt for ObjPayload {
     fn init(_base: Base<Self::Base>) -> Self {
         Self { value: 111 }
     }

diff --git a/itest/rust/src/virtual_methods_test.rs b/itest/rust/src/virtual_methods_test.rs
@@ -35,7 +35,7 @@ struct VirtualMethodTest {
 impl VirtualMethodTest {}
 
 #[godot_api]
-impl RefCountedVirtual for VirtualMethodTest {
+impl GodotExt for VirtualMethodTest {
     fn to_string(&self) -> GodotString {
         format!("VirtualMethodTest[integer={}]", self.integer).into()
     }
@@ -50,7 +50,7 @@ struct ReadyVirtualTest {
 }
 
 #[godot_api]
-impl Node2DVirtual for ReadyVirtualTest {
+impl GodotExt for ReadyVirtualTest {
     fn init(base: Base<Node2D>) -> Self {
         ReadyVirtualTest {
             some_base: base,
@@ -73,7 +73,7 @@ struct TreeVirtualTest {
 }
 
 #[godot_api]
-impl Node2DVirtual for TreeVirtualTest {
+impl GodotExt for TreeVirtualTest {
     fn init(base: Base<Node2D>) -> Self {
         TreeVirtualTest {
             some_base: base,