WIP: types: allow for duplicate names if the cfg options are different

ahayzen-kdab · Sep 5, 2024 · 33a83cc · 33a83cc
1 parent 55bfb54
commit 33a83cc
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/syntax/attrs.rs b/syntax/attrs.rs
@@ -282,8 +282,8 @@ fn parse_rust_name_attribute(meta: &Meta) -> Result<Ident> {
     Err(Error::new_spanned(meta, "unsupported rust_name attribute"))
 }
 
-#[derive(Clone)]
-pub(crate) struct OtherAttrs(Vec<Attribute>);
+#[derive(Clone, Debug)]
+pub(crate) struct OtherAttrs(pub(crate) Vec<Attribute>);
 
 impl OtherAttrs {
     pub(crate) fn none() -> Self {

diff --git a/syntax/cfg.rs b/syntax/cfg.rs
@@ -3,7 +3,7 @@ use std::mem;
 use syn::parse::{Error, ParseStream, Result};
 use syn::{parenthesized, token, Attribute, LitStr, Token};
 
-#[derive(Clone)]
+#[derive(Clone, Debug, Eq, PartialEq, Hash)]
 pub(crate) enum CfgExpr {
     Unconditional,
     #[allow(dead_code)] // only used by cxx-build, not cxxbridge-macro

diff --git a/syntax/types.rs b/syntax/types.rs
@@ -142,7 +142,11 @@ impl<'a> Types<'a> {
                 Api::CxxFunction(efn) | Api::RustFunction(efn) => {
                     // Note: duplication of the C++ name is fine because C++ has
                     // function overloading.
-                    if !function_names.insert((&efn.receiver, &efn.name.rust)) {
+                    if !matches!(efn.cfg, crate::syntax::CfgExpr::Unconditional) {
+                        println!("FUNCTION: cfg -> {:?}", efn.cfg);
+                        // println!("FUNCTION: attrs -> {:?}", efn.attrs);
+                    }
+                    if !function_names.insert((&efn.receiver, &efn.name.rust, &efn.cfg)) {
                         duplicate_name(cx, efn, &efn.name.rust);
                     }
                     for arg in &efn.args {