diff --git a/examples/array_export/src/lib.rs b/examples/array_export/src/lib.rs index 9430aba55..8f9481299 100644 --- a/examples/array_export/src/lib.rs +++ b/examples/array_export/src/lib.rs @@ -14,12 +14,12 @@ impl ExportsArrays { fn register(builder: &ClassBuilder) { builder - .build_property::("single_array") + .property::("single_array") .with_setter(ExportsArrays::set_single_array) .done(); builder - .build_property::("single_array_range") + .property::("single_array_range") .with_setter(ExportsArrays::set_single_array_range) .with_hint(ArrayHint::with_element_hint::(IntHint::Range( RangeHint::new(-5, 5), @@ -27,7 +27,7 @@ impl ExportsArrays { .done(); builder - .build_property::("double_array") + .property::("double_array") .with_setter(ExportsArrays::set_double_array) .with_hint(ArrayHint::with_element_hint::( ArrayHint::new(), @@ -35,7 +35,7 @@ impl ExportsArrays { .done(); builder - .build_property::("double_array_range") + .property::("double_array_range") .with_setter(ExportsArrays::set_double_array_range) .with_hint(ArrayHint::with_element_hint::( ArrayHint::with_element_hint::(IntHint::Range(RangeHint::new(-5, 5))), diff --git a/examples/spinning_cube/src/lib.rs b/examples/spinning_cube/src/lib.rs index 8a961b3b7..bcee4f2c5 100644 --- a/examples/spinning_cube/src/lib.rs +++ b/examples/spinning_cube/src/lib.rs @@ -15,7 +15,7 @@ struct RustTest { fn register_properties(builder: &ClassBuilder) { builder - .build_property::("test/test_enum") + .property::("test/test_enum") .with_hint(StringHint::Enum(EnumHint::new(vec![ "Hello".into(), "World".into(), @@ -25,7 +25,7 @@ fn register_properties(builder: &ClassBuilder) { .done(); builder - .build_property("test/test_flags") + .property("test/test_flags") .with_hint(IntHint::Flags(EnumHint::new(vec![ "A".into(), "B".into(), diff --git a/gdnative-async/src/rt/bridge.rs b/gdnative-async/src/rt/bridge.rs index 8347277ac..e48ad2ea4 100644 --- a/gdnative-async/src/rt/bridge.rs +++ b/gdnative-async/src/rt/bridge.rs @@ -135,7 +135,7 @@ impl Method for OnSignalFn { impl NativeClassMethods for SignalBridge { fn register(builder: &ClassBuilder) { builder - .build_method("_on_signal", OnSignalFn) + .method("_on_signal", OnSignalFn) .done_stateless(); } } diff --git a/gdnative-async/src/rt/func_state.rs b/gdnative-async/src/rt/func_state.rs index 4b960dab9..6626f89ea 100644 --- a/gdnative-async/src/rt/func_state.rs +++ b/gdnative-async/src/rt/func_state.rs @@ -169,10 +169,10 @@ impl StaticArgsMethod for ResumeFn { impl NativeClassMethods for FuncState { fn register(builder: &ClassBuilder) { builder - .build_method("is_valid", StaticArgs::new(IsValidFn)) + .method("is_valid", StaticArgs::new(IsValidFn)) .done_stateless(); builder - .build_method("resume", StaticArgs::new(ResumeFn)) + .method("resume", StaticArgs::new(ResumeFn)) .done_stateless(); } } diff --git a/gdnative-core/src/export/class_builder.rs b/gdnative-core/src/export/class_builder.rs index 189d5c105..740d4f38b 100644 --- a/gdnative-core/src/export/class_builder.rs +++ b/gdnative-core/src/export/class_builder.rs @@ -76,7 +76,7 @@ impl ClassBuilder { /// /// fn my_register(builder: &ClassBuilder) { /// builder - /// .build_method("my_method", MyMethod) + /// .method("my_method", MyMethod) /// .with_rpc_mode(RpcMode::RemoteSync) /// .done(); /// } @@ -95,7 +95,7 @@ impl ClassBuilder { /// ``` /// #[inline] - pub fn build_method<'a, F: Method>( + pub fn method<'a, F: Method>( &'a self, name: &'a str, method: F, @@ -128,7 +128,7 @@ impl ClassBuilder { /// /// fn my_register(builder: &ClassBuilder) { /// builder - /// .build_property("foo") + /// .property("foo") /// .with_default(5) /// .with_hint((-10..=30).into()) /// .with_getter(MyType::get_foo) @@ -138,7 +138,7 @@ impl ClassBuilder { /// } /// ``` #[inline] - pub fn build_property<'a, T>(&'a self, name: &'a str) -> PropertyBuilder<'a, C, T> + pub fn property<'a, T>(&'a self, name: &'a str) -> PropertyBuilder<'a, C, T> where T: Export, { diff --git a/gdnative-derive/src/lib.rs b/gdnative-derive/src/lib.rs index 8b8938fe7..bd9b70d7f 100644 --- a/gdnative-derive/src/lib.rs +++ b/gdnative-derive/src/lib.rs @@ -50,7 +50,7 @@ mod variant; /// impl gdnative::export::NativeClassMethods for Foo { /// fn register(builder: &ClassBuilder) { /// use gdnative::export::*; -/// builder.build_method("foo", gdnative::export::godot_wrap_method!(Foo, fn foo(&self, _owner: &Reference, bar: i64) -> i64)) +/// builder.method("foo", gdnative::export::godot_wrap_method!(Foo, fn foo(&self, _owner: &Reference, bar: i64) -> i64)) /// .with_rpc_mode(RpcMode::Disabled) /// .done_stateless(); /// } @@ -177,7 +177,7 @@ pub fn profiled(meta: TokenStream, input: TokenStream) -> TokenStream { /// } /// fn my_register_function(builder: &ClassBuilder) { /// builder.add_signal(Signal { name: "foo", args: &[] }); -/// builder.build_property::("bar") +/// builder.property::("bar") /// .with_getter(|_, _| 42.0) /// .with_hint(FloatHint::Range(RangeHint::new(0.0, 100.0))) /// .done(); diff --git a/gdnative-derive/src/methods.rs b/gdnative-derive/src/methods.rs index 1a1d15ef3..730ff2f22 100644 --- a/gdnative-derive/src/methods.rs +++ b/gdnative-derive/src/methods.rs @@ -133,7 +133,7 @@ pub(crate) fn derive_methods(item_impl: ItemImpl) -> TokenStream2 { fn #name ( #( #args )* ) -> #ret_ty ); - #builder.build_method(#name_string, method) + #builder.method(#name_string, method) .with_rpc_mode(#rpc) .done_stateless(); } diff --git a/gdnative-derive/src/native_script.rs b/gdnative-derive/src/native_script.rs index 61214e973..a0da35852 100644 --- a/gdnative-derive/src/native_script.rs +++ b/gdnative-derive/src/native_script.rs @@ -79,7 +79,7 @@ pub(crate) fn derive_native_class(derive_input: &DeriveInput) -> Result for ResumeAddFn { fn register_methods(builder: &ClassBuilder) { builder - .build_method("resume_add", Async::new(ResumeAddFn)) + .method("resume_add", Async::new(ResumeAddFn)) .done(); } diff --git a/test/src/test_register.rs b/test/src/test_register.rs index 0cc347093..d25a4a07c 100644 --- a/test/src/test_register.rs +++ b/test/src/test_register.rs @@ -61,7 +61,7 @@ impl NativeClass for RegisterProperty { } fn register_properties(builder: &ClassBuilder) { builder - .build_property("value") + .property("value") .with_default(42) .with_setter(RegisterProperty::set_value) .with_getter(RegisterProperty::get_value) @@ -155,15 +155,15 @@ where fn register_methods(builder: &ClassBuilder) { builder - .build_method("add_ints", StaticArgs::new(StatefulMixin { d: 42 })) + .method("add_ints", StaticArgs::new(StatefulMixin { d: 42 })) .done(); builder - .build_method("add_floats", StaticArgs::new(StatefulMixin { d: 4.0 })) + .method("add_floats", StaticArgs::new(StatefulMixin { d: 4.0 })) .done(); builder - .build_method( + .method( "add_vectors", StaticArgs::new(StatefulMixin { d: Vector2::new(1.0, 2.0),