Move fix-point analyses to their own module

5 files changed, 14 insertions, 12 deletions

diff --git a/src/ir/cant_derive_debug.rs b/src/ir/analysis/cant_derive_debug.rs
index f6a7fab7..5892bd09 100644
--- a/src/ir/cant_derive_debug.rs
+++ b/src/ir/analysis/cant_derive_debug.rs
@@ -1,5 +1,5 @@
 //! Determining which types for which we can emit `#[derive(Debug)]`.
-use super::analysis::MonotoneFramework;
+use super::MonotoneFramework;
 use ir::context::{BindgenContext, ItemId};
 use ir::item::ItemSet;
 use std::collections::HashSet;
diff --git a/src/ir/analysis.rs b/src/ir/analysis/mod.rs
index e12f890f..a757e3b6 100644
--- a/src/ir/analysis.rs
+++ b/src/ir/analysis/mod.rs
@@ -37,6 +37,12 @@
 //!
 //! [spa]: https://cs.au.dk/~amoeller/spa/spa.pdf
 
+// Re-export individual analyses.
+mod template_params;
+pub use self::template_params::UsedTemplateParameters;
+mod cant_derive_debug;
+pub use self::cant_derive_debug::CantDeriveDebugAnalysis;
+
 use std::fmt;
 
 /// An analysis in the monotone framework.
diff --git a/src/ir/named.rs b/src/ir/analysis/template_params.rs
index 6176faf1..ab4eca3c 100644
--- a/src/ir/named.rs
+++ b/src/ir/analysis/template_params.rs
@@ -88,12 +88,12 @@
 //!
 //! See `src/ir/analysis.rs` for more.
 
-use super::analysis::MonotoneFramework;
-use super::context::{BindgenContext, ItemId};
-use super::item::{Item, ItemSet};
-use super::template::{TemplateInstantiation, TemplateParameters};
-use super::traversal::{EdgeKind, Trace};
-use super::ty::TypeKind;
+use super::MonotoneFramework;
+use ir::context::{BindgenContext, ItemId};
+use ir::item::{Item, ItemSet};
+use ir::template::{TemplateInstantiation, TemplateParameters};
+use ir::traversal::{EdgeKind, Trace};
+use ir::ty::TypeKind;
 use std::collections::{HashMap, HashSet};
 
 /// An analysis that finds for each IR item its set of template parameters that
diff --git a/src/ir/context.rs b/src/ir/context.rs
index a0c76186..d0114144 100644
--- a/src/ir/context.rs
+++ b/src/ir/context.rs
@@ -5,12 +5,10 @@ use super::int::IntKind;
 use super::item::{IsOpaque, Item, ItemAncestors, ItemCanonicalPath, ItemSet};
 use super::item_kind::ItemKind;
 use super::module::{Module, ModuleKind};
-use super::named::UsedTemplateParameters;
-use super::analysis::analyze;
+use super::analysis::{analyze, UsedTemplateParameters, CantDeriveDebugAnalysis};
 use super::template::{TemplateInstantiation, TemplateParameters};
 use super::traversal::{self, Edge, ItemTraversal};
 use super::ty::{FloatKind, Type, TypeKind};
-use super::cant_derive_debug::CantDeriveDebugAnalysis;
 use BindgenOptions;
 use cexpr;
 use callbacks::ParseCallbacks;
diff --git a/src/ir/mod.rs b/src/ir/mod.rs
index f8b9edfa..93894f94 100644
--- a/src/ir/mod.rs
+++ b/src/ir/mod.rs
@@ -17,10 +17,8 @@ pub mod item;
 pub mod item_kind;
 pub mod layout;
 pub mod module;
-pub mod named;
 pub mod template;
 pub mod traversal;
 pub mod ty;
 pub mod var;
 pub mod objc;
-pub mod cant_derive_debug;