Move metrics in their own module

src/asttools.rs

@@ -15,6 +15,7 @@ pub fn get_parent<'a>(node: &'a Node<'a>, level: usize) -> Option<Node<'a>> {
     Some(node)
 }
 
+#[macro_export]
 macro_rules! has_ancestors {
     ($node:expr, $( $typs:pat )|*, $( $typ:pat ),+) => {{
         let mut res = false;

src/lib.rs

@@ -19,33 +19,15 @@ pub use crate::enums::*;
 pub mod node;
 pub use crate::node::*;
 
+mod rca_metrics;
+pub(crate) use rca_metrics::*;
+
 pub mod web;
 
 #[macro_use]
 pub mod asttools;
 pub use crate::asttools::*;
 
-pub mod cyclomatic;
-pub use crate::cyclomatic::*;
-
-pub mod exit;
-pub use crate::exit::*;
-
-pub mod loc;
-pub use crate::loc::*;
-
-pub mod mi;
-pub use crate::mi::*;
-
-pub mod halstead;
-pub use crate::halstead::*;
-
-pub mod nom;
-pub use crate::nom::*;
-
-pub mod fn_args;
-pub use crate::fn_args::*;
-
 pub mod metrics;
 pub use crate::metrics::*;
 

src/mi.rs → src/rca_metrics/mi.rs

@@ -3,9 +3,9 @@ use serde::Serialize;
 use std::fmt;
 use tree_sitter::Node;
 
-use crate::cyclomatic;
-use crate::halstead;
-use crate::loc;
+use super::cyclomatic;
+use super::halstead;
+use super::loc;
 
 use crate::checker::Checker;
 

src/rca_metrics/mod.rs

@@ -0,0 +1,7 @@
+pub mod cyclomatic;
+pub mod exit;
+pub mod fn_args;
+pub mod halstead;
+pub mod loc;
+pub mod mi;
+pub mod nom;