Skip to content

Commit 1202abe

Browse files
committed
Re-enable export groups
This reverts commit afa2c06fde5685aa243ce4112e53b278c60a01e8.
1 parent ead0ecc commit 1202abe

File tree

4 files changed

+4
-18
lines changed

4 files changed

+4
-18
lines changed

godot-macros/Cargo.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ api-custom-json = ["godot-bindings/api-custom-json"]
1616
codegen-full = ["godot/__codegen-full"]
1717
experimental-wasm = []
1818
register-docs = ["dep:markdown", "dep:litrs"]
19-
trace = []
2019

2120
[lib]
2221
proc-macro = true

godot-macros/src/class/derive_godot_class.rs

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -667,18 +667,14 @@ fn parse_fields(
667667
parser.finish()?;
668668
}
669669

670-
// TODO(v0.3.5): re-enable groups. Currently enabled in tests.
671-
672670
// #[export_group(name = ..., prefix = ...)]
673-
#[cfg(feature = "trace")]
674671
if let Some(mut parser) = KvParser::parse(&named_field.attributes, "export_group")? {
675672
let group = FieldGroup::new_from_kv(&mut parser)?;
676673
field.group = Some(group);
677674
parser.finish()?;
678675
}
679676

680677
// #[export_subgroup(name = ..., prefix = ...)]
681-
#[cfg(feature = "trace")]
682678
if let Some(mut parser) = KvParser::parse(&named_field.attributes, "export_subgroup")? {
683679
let subgroup = FieldGroup::new_from_kv(&mut parser)?;
684680
field.subgroup = Some(subgroup);

godot-macros/src/lib.rs

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -300,7 +300,6 @@ use crate::util::{bail, ident, KvParser};
300300
/// }
301301
/// ```
302302
///
303-
/*
304303
/// It is possible to group your exported properties inside the Inspector with the `#[export_group(name = "...", prefix = "...")]` attribute.
305304
/// Every exported property after this attribute will be added to the group. Start a new group or use `#[export_group(name = "")]` (with an empty name) to break out.
306305
///
@@ -358,7 +357,6 @@ use crate::util::{bail, ident, KvParser};
358357
///```
359358
///
360359
///
361-
*/
362360
/// ## Low-level property hints and usage
363361
///
364362
/// You can specify custom property hints, hint strings, and usage flags in a `#[var]` attribute using the `hint`, `hint_string`
@@ -541,16 +539,9 @@ use crate::util::{bail, ident, KvParser};
541539
alias = "tool",
542540
alias = "rename"
543541
)]
544-
#[cfg_attr(
545-
feature = "trace",
546-
proc_macro_derive(
547-
GodotClass,
548-
attributes(class, init, base, hint, var, export, export_group, export_subgroup)
549-
)
550-
)]
551-
#[cfg_attr(
552-
not(feature = "trace"),
553-
proc_macro_derive(GodotClass, attributes(class, init, base, hint, var, export))
542+
#[proc_macro_derive(
543+
GodotClass,
544+
attributes(class, base, hint, var, export, export_group, export_subgroup, init)
554545
)]
555546
pub fn derive_godot_class(input: TokenStream) -> TokenStream {
556547
translate(input, class::derive_godot_class)

godot/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ default = ["__codegen-full"]
4848
# Private features, they are under no stability guarantee
4949
__codegen-full = ["godot-core/codegen-full", "godot-macros/codegen-full"]
5050
__debug-log = ["godot-core/debug-log"]
51-
__trace = ["godot-core/trace", "godot-macros/trace"]
51+
__trace = ["godot-core/trace"]
5252

5353
[dependencies]
5454
godot-core = { path = "../godot-core", version = "=0.3.4" }

0 commit comments

Comments
 (0)