Move with-timing to utils.clj.

Author: Raynes

src/flatland/useful/state.clj

@@ -71,15 +71,6 @@
                 curr)
             @result))))))
 
-(defmacro with-timing
-  "Same as clojure.core/time but returns a vector of a the result of
-   the code and the milliseconds rather than printing a string. Runs
-   the code in an implicit do."
-  [& body]
-  `(let [start# (System/nanoTime)
-         ret# ~(cons 'do body)]
-     [ret# (/ (double (- (System/nanoTime) start#)) 1000000.0)]))
-
 (let [executor (ScheduledThreadPoolExecutor. 1 (reify ThreadFactory
                                                  (newThread [this r]
                                                    (doto (Thread. r)

src/flatland/useful/utils.clj

@@ -262,4 +262,13 @@
        ~@(mapcat (fn [[val form]]
                    [(fix val, list? set, hash-set) form])
                  (partition 2 clauses))
-       ~default)))
+       ~default)))
+
+(defmacro with-timing
+  "Same as clojure.core/time but returns a vector of a the result of
+   the code and the milliseconds rather than printing a string. Runs
+   the code in an implicit do."
+  [& body]
+  `(let [start# (System/nanoTime)
+         ret# ~(cons 'do body)]
+     [ret# (/ (double (- (System/nanoTime) start#)) 1000000.0)]))

test/flatland/useful/state_test.clj

@@ -31,15 +31,6 @@
                     (swap! a inc))]
       (is (odd? (wait-until a odd?))))))
 
-(deftest test-with-timing
-  (let [[ret ms] (with-timing
-                   (+ 2 2)
-                   (+ 3 3))]
-    (is (= ret 6))
-    (is (float? ms))))
-
-
-
 (def ^{:dynamic true} *value* 1)
 
 (deftest test-alter-var

test/flatland/useful/utils_test.clj

@@ -190,3 +190,10 @@
     (is (= :b (switch 3,    #{1} :a, (2 3) :b, inc :c, :d)))
     (is (= :c (switch inc,  #{1} :a, (2 3) :b, inc :c, :d)))
     (is (= :d (switch :foo, #{1} :a, (2 3) :b, inc :c, :d)))))
+
+(deftest test-with-timing
+  (let [[ret ms] (with-timing
+                   (+ 2 2)
+                   (+ 3 3))]
+    (is (= ret 6))
+    (is (float? ms))))