commit 93e800ec2c54e163f8bab758cae78b7009d27039
author Devin Jeanpierre <jeanpierreda@google.com> Mon May 08 12:55:53 2023 -0700
committer Copybara-Service <copybara-worker@google.com> Mon May 08 12:56:45 2023 -0700
tree 1b975a71c3af5197bf57b593d20df0f2b0e3a741
parent aa3909251ffb0ea982ac36761c6076de23e93e15

Change type map overrides from an UnsupportedItem to a dedicated Item.

Aside from no longer looking like an error, this provides the space to add debug assertions later, such as verifying that size and alignment of the new type are the same as for the type it replaces.

PiperOrigin-RevId: 530384176

rs_bindings_from_cc/ir.rs

diff --git a/rs_bindings_from_cc/ir.rs b/rs_bindings_from_cc/ir.rs
index 9fc5fce..d28db2d 100644
--- a/rs_bindings_from_cc/ir.rs
+++ b/rs_bindings_from_cc/ir.rs
@@ -794,6 +794,27 @@
 }
 
 #[derive(Debug, PartialEq, Eq, Hash, Clone, Deserialize)]
+#[serde(deny_unknown_fields)]
+pub struct TypeMapOverride {
+    #[serde(rename(deserialize = "type"))]
+    pub type_: MappedType,
+    pub owning_target: BazelLabel,
+    pub id: ItemId,
+}
+
+impl GenericItem for TypeMapOverride {
+    fn id(&self) -> ItemId {
+        self.id
+    }
+    fn debug_name(&self, _: &IR) -> Rc<str> {
+        self.type_.cc_type.name.clone().unwrap_or_else(|| Rc::from("<anonymous C++ type>"))
+    }
+    fn source_loc(&self) -> Option<Rc<str>> {
+        None
+    }
+}
+
+#[derive(Debug, PartialEq, Eq, Hash, Clone, Deserialize)]
 pub enum Item {
     Func(Rc<Func>),
     IncompleteRecord(Rc<IncompleteRecord>),
@@ -804,21 +825,23 @@
     Comment(Rc<Comment>),
     Namespace(Rc<Namespace>),
     UseMod(Rc<UseMod>),
+    TypeMapOverride(Rc<TypeMapOverride>),
 }
 
 macro_rules! forward_item {
     (match $item:ident { _($item_name:ident) => $expr:expr $(,)? }) => {
         match $item {
-                                                    Item::Func($item_name) => $expr,
-                                                    Item::IncompleteRecord($item_name) => $expr,
-                                                    Item::Record($item_name) => $expr,
-                                                    Item::Enum($item_name) => $expr,
-                                                    Item::TypeAlias($item_name) => $expr,
-                                                    Item::UnsupportedItem($item_name) => $expr,
-                                                    Item::Comment($item_name) => $expr,
-                                                    Item::Namespace($item_name) => $expr,
-                                                    Item::UseMod($item_name) => $expr,
-                                                }
+            Item::Func($item_name) => $expr,
+            Item::IncompleteRecord($item_name) => $expr,
+            Item::Record($item_name) => $expr,
+            Item::Enum($item_name) => $expr,
+            Item::TypeAlias($item_name) => $expr,
+            Item::UnsupportedItem($item_name) => $expr,
+            Item::Comment($item_name) => $expr,
+            Item::Namespace($item_name) => $expr,
+            Item::UseMod($item_name) => $expr,
+            Item::TypeMapOverride($item_name) => $expr,
+        }
     };
 }
 
@@ -858,6 +881,7 @@
             Item::Comment(..) => None,
             Item::UnsupportedItem(..) => None,
             Item::UseMod(..) => None,
+            Item::TypeMapOverride(..) => None,
         }
     }
 
@@ -882,6 +906,7 @@
             Item::Comment(..) => None,
             Item::Namespace(..) => None,
             Item::UseMod(..) => None,
+            Item::TypeMapOverride(type_override) => Some(&type_override.owning_target),
         }
     }
 }