CLJS-1660: cljs.spec: Always return var from instrument / unstrument

Author: mfikes

src/main/cljs/cljs/spec.cljc

@@ -385,17 +385,19 @@ specified, return speced vars from all namespaces."
   [v]
   (let [v   (if-not (seq? v) (list 'var v) v)
         sym (second v)]
-    `(when-let [checked# (cljs.spec/instrument* ~v)]
-       (set! ~sym checked#)
+    `(do
+       (when-let [checked# (cljs.spec/instrument* ~v)]
+         (set! ~sym checked#))
        ~v)))
 
 (defmacro unstrument
   "Undoes instrument on the var at v, a var or symbol. Idempotent."
   [v]
   (let [v   (if-not (seq? v) (list 'var v) v)
         sym (second v)]
-    `(when-let [raw# (cljs.spec/unstrument* ~v)]
-       (set! ~sym raw#)
+    `(do
+       (when-let [raw# (cljs.spec/unstrument* ~v)]
+         (set! ~sym raw#))
        ~v)))
 
 (defmacro instrument-ns