Factor out Dependencies::add_path

src/bindgen/dependencies.rs

@@ -7,6 +7,8 @@ use std::collections::HashSet;
 
 use crate::bindgen::ir::{ItemContainer, Path};
 
+use super::library::Library;
+
 /// A dependency list is used for gathering what order to output the types.
 #[derive(Default)]
 pub struct Dependencies {
@@ -22,6 +24,24 @@ impl Dependencies {
         }
     }
 
+    pub fn add_path(&mut self, library: &Library, path: &Path) {
+        if let Some(items) = library.get_items(path) {
+            if !self.items.contains(path) {
+                self.items.insert(path.clone());
+
+                for item in &items {
+                    item.deref().add_dependencies(library, self);
+                }
+                self.order.extend(items);
+            }
+        } else {
+            warn!(
+                "Can't find {}. This usually means that this type was incompatible or not found.",
+                path
+            );
+        }
+    }
+
     pub fn sort(&mut self) {
         // Sort untagged enums and opaque structs into their own layers because they don't
         // depend on each other or anything else.

src/bindgen/ir/enumeration.rs

@@ -686,12 +686,7 @@ impl Item for Enum {
                 let path = Path::new(tag);
 
                 // If there is an external tag enum, then add it as a dependency.
-                if let Some(items) = library.get_items(&path) {
-                    if !out.items.contains(&path) {
-                        out.items.insert(path);
-                        out.order.extend(items);
-                    }
-                }
+                out.add_path(library, &path);
             }
         }
 

src/bindgen/ir/ty.rs

@@ -823,24 +823,7 @@ impl Type {
                 }
                 let path = generic.path();
                 if !generic_params.iter().any(|param| param.name() == path) {
-                    if let Some(items) = library.get_items(path) {
-                        if !out.items.contains(path) {
-                            out.items.insert(path.clone());
-
-                            for item in &items {
-                                item.deref().add_dependencies(library, out);
-                            }
-                            for item in items {
-                                out.order.push(item);
-                            }
-                        }
-                    } else {
-                        warn!(
-                            "Can't find {}. This usually means that this type was incompatible or \
-                             not found.",
-                            path
-                        );
-                    }
+                    out.add_path(library, path);
                 }
             }
             Type::Primitive(_) => {}