Move printlns to dev.clj

metosin · Jun 21, 2023 · c760756 · c760756
1 parent 58472b2
commit c760756
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 14 deletions.
diff --git a/src/malli/dev.clj b/src/malli/dev.clj
@@ -8,7 +8,10 @@
   "Stops instrumentation for all functions vars and removes clj-kondo type annotations."
   []
   (remove-watch @#'m/-function-schemas* ::watch)
-  (mi/unstrument!)
+  (->> (mi/unstrument!)
+       count
+       (format "unstrumented %d vars")
+       println)
   (clj-kondo/save! {})
   (println "stopped instrumentation"))
 
@@ -22,13 +25,18 @@
    (with-out-str (stop!))
    (mi/collect! {:ns (all-ns)})
    (let [watch (fn [_ _ old new]
-                 (mi/instrument! (assoc options :data (->> (for [[n d] (:clj new)
-                                                                 :let [no (get-in old [:clj n])]
-                                                                 [s d] d
-                                                                 :when (not= d (get no s))]
-                                                             [[n s] d])
-                                                           (into {})
-                                                           (reduce-kv assoc-in {}))))
+                 (->> (for [[n d] (:clj new)
+                            :let [no (get-in old [:clj n])]
+                            [s d] d
+                            :when (not= d (get no s))]
+                        [[n s] d])
+                      (into {})
+                      (reduce-kv assoc-in {})
+                      (assoc options :data)
+                      mi/instrument!
+                      count
+                      (format "instrumented %d vars")
+                      println)
                  (clj-kondo/emit!))]
      (add-watch @#'m/-function-schemas* ::watch watch))
    (mi/instrument! options)

diff --git a/src/malli/instrument.clj b/src/malli/instrument.clj
@@ -146,14 +146,10 @@
   "Applies instrumentation for a filtered set of function Vars (e.g. `defn`s).
    See [[malli.core/-instrument]] for possible options."
   ([] (instrument! nil))
-  ([options]
-    (doto (-strument! (assoc options :mode :instrument))
-      (->> count (format "Instrumented %d vars") println))))
+  ([options] (-strument! (assoc options :mode :instrument))))
 
 (defn unstrument!
   "Removes instrumentation from a filtered set of function Vars (e.g. `defn`s).
    See [[malli.core/-instrument]] for possible options."
   ([] (unstrument! nil))
-  ([options]
-    (doto (-strument! (assoc options :mode :unstrument))
-      (->> count (format "Unstrumented %d vars") println))))
+  ([options] (-strument! (assoc options :mode :unstrument))))