transpile: Split off TypedAstContext::set_prenamed_decls

Author: Rua

c2rust-transpile/src/c_ast/mod.rs

@@ -996,6 +996,54 @@ impl TypedAstContext {
         }
     }
 
+    /// Identifies typedefs that name unnamed types.
+    /// Later, the two declarations can be collapsed into a single name and declaration,
+    /// eliminating the typedef altogether.
+    pub fn set_prenamed_decls(&mut self) {
+        let mut prenamed_decls: IndexMap<CDeclId, CDeclId> = IndexMap::new();
+
+        for (&decl_id, decl) in self.iter_decls() {
+            if let CDeclKind::Typedef { ref name, typ, .. } = decl.kind {
+                if let Some(subdecl_id) = self.resolve_type(typ.ctype).kind.as_underlying_decl() {
+                    use CDeclKind::*;
+                    let is_unnamed = match self[subdecl_id].kind {
+                        Struct { name: None, .. }
+                        | Union { name: None, .. }
+                        | Enum { name: None, .. } => true,
+
+                        // Detect case where typedef and struct share the same name.
+                        // In this case the purpose of the typedef was simply to eliminate
+                        // the need for the 'struct' tag when referring to the type name.
+                        Struct {
+                            name: Some(ref target_name),
+                            ..
+                        }
+                        | Union {
+                            name: Some(ref target_name),
+                            ..
+                        }
+                        | Enum {
+                            name: Some(ref target_name),
+                            ..
+                        } => name == target_name,
+
+                        _ => false,
+                    };
+
+                    if is_unnamed
+                        && !prenamed_decls
+                            .values()
+                            .any(|decl_id| *decl_id == subdecl_id)
+                    {
+                        prenamed_decls.insert(decl_id, subdecl_id);
+                    }
+                }
+            }
+        }
+
+        self.prenamed_decls = prenamed_decls;
+    }
+
     pub fn prune_unwanted_decls(&mut self, want_unused_functions: bool) {
         // Starting from a set of root declarations, walk each one to find declarations it
         // depends on. Then walk each of those, recursively.

c2rust-transpile/src/translator/mod.rs

@@ -739,60 +739,19 @@ pub fn translate(
 
         // Identify typedefs that name unnamed types and collapse the two declarations
         // into a single name and declaration, eliminating the typedef altogether.
-        let mut prenamed_decls: IndexMap<CDeclId, CDeclId> = IndexMap::new();
-        for (&decl_id, decl) in t.ast_context.iter_decls() {
-            if let CDeclKind::Typedef { ref name, typ, .. } = decl.kind {
-                if let Some(subdecl_id) = t
-                    .ast_context
-                    .resolve_type(typ.ctype)
-                    .kind
-                    .as_underlying_decl()
-                {
-                    use CDeclKind::*;
-                    let is_unnamed = match t.ast_context[subdecl_id].kind {
-                        Struct { name: None, .. }
-                        | Union { name: None, .. }
-                        | Enum { name: None, .. } => true,
-
-                        // Detect case where typedef and struct share the same name.
-                        // In this case the purpose of the typedef was simply to eliminate
-                        // the need for the 'struct' tag when referring to the type name.
-                        Struct {
-                            name: Some(ref target_name),
-                            ..
-                        }
-                        | Union {
-                            name: Some(ref target_name),
-                            ..
-                        }
-                        | Enum {
-                            name: Some(ref target_name),
-                            ..
-                        } => name == target_name,
-
-                        _ => false,
-                    };
-
-                    if is_unnamed
-                        && !prenamed_decls
-                            .values()
-                            .any(|decl_id| *decl_id == subdecl_id)
-                    {
-                        prenamed_decls.insert(decl_id, subdecl_id);
+        t.ast_context.set_prenamed_decls();
 
-                        t.type_converter
-                            .borrow_mut()
-                            .declare_decl_name(decl_id, name);
-                        t.type_converter
-                            .borrow_mut()
-                            .alias_decl_name(subdecl_id, decl_id);
-                    }
-                }
+        for (&decl_id, &subdecl_id) in &t.ast_context.prenamed_decls {
+            if let CDeclKind::Typedef { ref name, .. } = t.ast_context[decl_id].kind {
+                t.type_converter
+                    .borrow_mut()
+                    .declare_decl_name(decl_id, name);
+                t.type_converter
+                    .borrow_mut()
+                    .alias_decl_name(subdecl_id, decl_id);
             }
         }
 
-        t.ast_context.prenamed_decls = prenamed_decls;
-
         // Helper function that returns true if there is either a matching typedef or its
         // corresponding struct/union/enum
         fn contains(prenamed_decls: &IndexMap<CDeclId, CDeclId>, decl_id: &CDeclId) -> bool {