Skip to content

Fix the #[qenum] attribute breaking compilation #1420

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jnbooth wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Fix the #[qenum] attribute breaking compilation #1420

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4e4a416
cxx-qt-gen: remove pub(super) from #[qenum] gen
jnbooth Feb 23, 2026
a6a1444
cxx-qt-gen: remove unnecessary #[allow(private_interfaces)]`
jnbooth Feb 23, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions crates/cxx-qt-gen/src/generator/rust/qenum.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,6 @@ fn generate_member_qenum(qenum: &ParsedQEnum) -> GeneratedRustFragment {
item.span() =>
#(#cfgs)*
extern "C++" {
#[allow(private_interfaces)]
#(#docs)*
#(#qenum_attrs)*
type #qenum_ident = super::#module_name::#qenum_ident;
Expand All @@ -82,7 +81,7 @@ fn generate_member_qenum(qenum: &ParsedQEnum) -> GeneratedRustFragment {
#(#docs)*
#[derive(PartialEq, Eq, Clone, Copy)]
#[repr(transparent)]
pub(super) struct #qenum_ident {
pub struct #qenum_ident {
#[allow(missing_docs)]
pub repr: i32
}
Expand Down Expand Up @@ -219,7 +218,6 @@ mod tests {
&generated.cxx_mod_contents[0],
quote! {
extern "C++" {
#[allow(private_interfaces)]
#[doc = r" Doc comment"]
#[namespace = "my_namespace"]
type MyEnum = super::cxx_qt_private_qenum_MyEnum::MyEnum;
Expand All @@ -234,7 +232,7 @@ mod tests {
#[doc = r" Doc comment"]
#[derive(PartialEq, Eq, Clone, Copy)]
#[repr(transparent)]
pub(super) struct MyEnum {
pub struct MyEnum {
#[allow(missing_docs)]
pub repr: i32
}
Expand Down
12 changes: 4 additions & 8 deletions crates/cxx-qt-gen/test_outputs/cfgs.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -485,22 +485,18 @@ mod ffi {
}
#[cfg(not(enabled))]
extern "C++" {
#[allow(private_interfaces)]
type EnumDisabled1 = super::cxx_qt_private_qenum_EnumDisabled1::EnumDisabled1;
}
#[cfg(enabled)]
extern "C++" {
#[allow(private_interfaces)]
type EnumEnabled1 = super::cxx_qt_private_qenum_EnumEnabled1::EnumEnabled1;
}
#[cfg(not(enabled))]
extern "C++" {
#[allow(private_interfaces)]
type EnumDisabled2 = super::cxx_qt_private_qenum_EnumDisabled2::EnumDisabled2;
}
#[cfg(enabled)]
extern "C++" {
#[allow(private_interfaces)]
type EnumEnabled2 = super::cxx_qt_private_qenum_EnumEnabled2::EnumEnabled2;
}
}
Expand Down Expand Up @@ -1226,7 +1222,7 @@ cxx_qt::static_assertions::assert_eq_size!(
mod cxx_qt_private_qenum_EnumDisabled1 {
#[derive(PartialEq, Eq, Clone, Copy)]
#[repr(transparent)]
pub(super) struct EnumDisabled1 {
pub struct EnumDisabled1 {
#[allow(missing_docs)]
pub repr: i32,
}
Expand All @@ -1244,7 +1240,7 @@ mod cxx_qt_private_qenum_EnumDisabled1 {
mod cxx_qt_private_qenum_EnumEnabled1 {
#[derive(PartialEq, Eq, Clone, Copy)]
#[repr(transparent)]
pub(super) struct EnumEnabled1 {
pub struct EnumEnabled1 {
#[allow(missing_docs)]
pub repr: i32,
}
Expand All @@ -1262,7 +1258,7 @@ mod cxx_qt_private_qenum_EnumEnabled1 {
mod cxx_qt_private_qenum_EnumDisabled2 {
#[derive(PartialEq, Eq, Clone, Copy)]
#[repr(transparent)]
pub(super) struct EnumDisabled2 {
pub struct EnumDisabled2 {
#[allow(missing_docs)]
pub repr: i32,
}
Expand All @@ -1280,7 +1276,7 @@ mod cxx_qt_private_qenum_EnumDisabled2 {
mod cxx_qt_private_qenum_EnumEnabled2 {
#[derive(PartialEq, Eq, Clone, Copy)]
#[repr(transparent)]
pub(super) struct EnumEnabled2 {
pub struct EnumEnabled2 {
#[allow(missing_docs)]
pub repr: i32,
}
Expand Down
9 changes: 3 additions & 6 deletions crates/cxx-qt-gen/test_outputs/qenum.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,12 +117,10 @@ mod ffi {
type QObject = cxx_qt::QObject;
}
extern "C++" {
#[allow(private_interfaces)]
#[namespace = "cxx_qt::my_object"]
type MyEnum = super::cxx_qt_private_qenum_MyEnum::MyEnum;
}
extern "C++" {
#[allow(private_interfaces)]
#[namespace = "my_namespace"]
type MyOtherEnum = super::cxx_qt_private_qenum_MyOtherEnum::MyOtherEnum;
}
Expand All @@ -148,7 +146,6 @@ mod ffi {
type MyOtherNamespacedEnum;
}
extern "C++" {
#[allow(private_interfaces)]
#[namespace = "cxx_qt::my_object"]
type MyRenamedEnum = super::cxx_qt_private_qenum_MyRenamedEnum::MyRenamedEnum;
}
Expand Down Expand Up @@ -212,7 +209,7 @@ impl ::cxx_qt::CxxQtType for ffi::MyRenamedObject {
mod cxx_qt_private_qenum_MyEnum {
#[derive(PartialEq, Eq, Clone, Copy)]
#[repr(transparent)]
pub(super) struct MyEnum {
pub struct MyEnum {
#[allow(missing_docs)]
pub repr: i32,
}
Expand All @@ -229,7 +226,7 @@ mod cxx_qt_private_qenum_MyEnum {
mod cxx_qt_private_qenum_MyOtherEnum {
#[derive(PartialEq, Eq, Clone, Copy)]
#[repr(transparent)]
pub(super) struct MyOtherEnum {
pub struct MyOtherEnum {
#[allow(missing_docs)]
pub repr: i32,
}
Expand All @@ -248,7 +245,7 @@ mod cxx_qt_private_qenum_MyOtherEnum {
mod cxx_qt_private_qenum_MyRenamedEnum {
#[derive(PartialEq, Eq, Clone, Copy)]
#[repr(transparent)]
pub(super) struct MyRenamedEnum {
pub struct MyRenamedEnum {
#[allow(missing_docs)]
pub repr: i32,
}
Expand Down
Loading