model_utils: limit dependency to `model`.

Also update tools importing `model_utils`

Signed-off-by: Alexandre Terrasa <alexandre@moz-code.org>

diff --git a/src/metrics/metrics_base.nit b/src/metrics/metrics_base.nit
index e39cf51..b55e1b8 100644 (file)
--- a/src/metrics/metrics_base.nit
+++ b/src/metrics/metrics_base.nit
@@ -19,6 +19,7 @@
 module metrics_base
 
 import model_utils
+import modelbuilder
 import csv
 import counter
 import console

diff --git a/src/model_utils.nit b/src/model_utils.nit
index 3fba8dc..bc8d2cb 100644 (file)
--- a/src/model_utils.nit
+++ b/src/model_utils.nit
@@ -17,7 +17,7 @@
 # Model exploration and traversing facilities
 module model_utils
 
-import modelbuilder
+import model
 
 redef class MConcern
 

diff --git a/src/nitmetrics.nit b/src/nitmetrics.nit
index 89bec39..ab95c3d 100644 (file)
--- a/src/nitmetrics.nit
+++ b/src/nitmetrics.nit
@@ -17,7 +17,6 @@
 # A program that collects various metrics on nit programs and libraries
 module nitmetrics
 
-import modelbuilder
 import frontend
 import metrics