pod -> reinterpret and UnionStore -> UnionStorage

Author: lucic71

cpp2rust/converter/models/converter_refcount.cpp

@@ -474,7 +474,7 @@ void ConverterRefCount::AddDefaultTraitForUnion(const clang::RecordDecl *decl) {
   PushBrace impl_brace(*this);
   StrCat("fn default() -> Self");
   PushBrace fn_brace(*this);
-  StrCat(std::format("{} {{ __store: libcc2rs::UnionStore::new({}) }}", name,
+  StrCat(std::format("{} {{ __store: libcc2rs::UnionStorage::new({}) }}", name,
                      ctx_.getASTRecordLayout(decl).getSize().getQuantity()));
 }
 
@@ -491,14 +491,14 @@ void ConverterRefCount::EmitRustUnion(clang::RecordDecl *decl) {
   StrCat(")]");
 
   StrCat(
-      std::format("pub struct {} {{ __store: libcc2rs::UnionStore, }}", name));
+      std::format("pub struct {} {{ __store: libcc2rs::UnionStorage, }}", name));
 
   StrCat(std::format("impl {}", name));
   {
     PushBrace impl_brace(*this);
     for (auto *field : decl->fields()) {
       StrCat(std::format(
-          "pub fn {}(&self) -> Ptr<{}> {{ self.__store.pod(0) }}",
+          "pub fn {}(&self) -> Ptr<{}> {{ self.__store.reinterpret(0) }}",
           GetNamedDeclAsString(field), Mapper::Map(field->getType())));
     }
   }

libcc2rs/src/union.rs

@@ -6,28 +6,28 @@ use std::{cell::RefCell, rc::Rc};
 use crate::Ptr;
 use crate::reinterpret::{ByteRepr, OriginalAlloc, SliceOriginalAlloc};
 
-pub struct UnionStore {
+pub struct UnionStorage {
     bytes: Rc<RefCell<Vec<u8>>>,
 }
 
-impl UnionStore {
+impl UnionStorage {
     pub fn new(size: usize) -> Self {
-        UnionStore {
+        UnionStorage {
             bytes: Rc::new(RefCell::new(vec![0u8; size])),
         }
     }
 
-    pub fn pod<T: ByteRepr>(&self, offset: usize) -> Ptr<T> {
+    pub fn reinterpret<T: ByteRepr>(&self, offset: usize) -> Ptr<T> {
         let alloc: Rc<dyn OriginalAlloc> = Rc::new(SliceOriginalAlloc {
             weak: Rc::downgrade(&self.bytes),
         });
         Ptr::reinterpreted(alloc, offset)
     }
 }
 
-impl Clone for UnionStore {
+impl Clone for UnionStorage {
     fn clone(&self) -> Self {
-        UnionStore {
+        UnionStorage {
             bytes: Rc::new(RefCell::new(self.bytes.borrow().clone())),
         }
     }