lint cljs

Author: puredanger

src/main/clojure/cljs/core/async.cljs

@@ -548,7 +548,7 @@
                        {:solos solos
                         :mutes (pick :mute chs)
                         :reads (conj
-                                (if (and (= mode :pause) (not (empty? solos)))
+                                (if (and (= mode :pause) (seq solos))
                                   (vec solos)
                                   (vec (remove pauses (keys chs))))
                                 change)}))

src/main/clojure/cljs/core/async/impl/channels.cljs

@@ -98,25 +98,24 @@
     (if (not ^boolean (impl/active? handler))
       nil
       (if (and (not (nil? buf)) (pos? (count buf)))
-        (do
-          (if-let [take-cb (impl/commit handler)]
-            (let [val (impl/remove! buf)
-                  [done? cbs] (when (and (not (impl/full? buf)) (pos? (.-length puts)))
-                                (loop [cbs []]
-                                  (let [putter (.pop puts)
-                                        ^not-native put-handler (.-handler putter)
-                                        val (.-val putter)
-                                        cb (and ^boolean (impl/active? put-handler) (impl/commit put-handler))
-                                        cbs (if cb (conj cbs cb) cbs)
-                                        done? (when cb (reduced? (add! buf val)))]
-                                    (if (and (not done?) (not (impl/full? buf)) (pos? (.-length puts)))
-                                      (recur cbs)
-                                      [done? cbs]))))]
-              (when done?
-                (abort this))
-              (doseq [cb cbs]
-                (dispatch/run #(cb true)))
-              (box val))))
+        (if-let [take-cb (impl/commit handler)]
+          (let [val (impl/remove! buf)
+                [done? cbs] (when (and (not (impl/full? buf)) (pos? (.-length puts)))
+                              (loop [cbs []]
+                                (let [putter (.pop puts)
+                                      ^not-native put-handler (.-handler putter)
+                                      val (.-val putter)
+                                      cb (and ^boolean (impl/active? put-handler) (impl/commit put-handler))
+                                      cbs (if cb (conj cbs cb) cbs)
+                                      done? (when cb (reduced? (add! buf val)))]
+                                  (if (and (not done?) (not (impl/full? buf)) (pos? (.-length puts)))
+                                    (recur cbs)
+                                    [done? cbs]))))]
+            (when done?
+              (abort this))
+            (doseq [cb cbs]
+              (dispatch/run #(cb true)))
+            (box val)))
         (let [putter (loop []
                        (let [putter (.pop puts)]
                          (when putter
@@ -132,9 +131,9 @@
               (do
                 (when buf (add! buf))
                 (if (and (impl/active? handler) (impl/commit handler))
-                  (let [has-val (and buf (pos? (count buf)))]
-                    (let [val (when has-val (impl/remove! buf))]
-                      (box val)))
+                  (let [has-val (and buf (pos? (count buf)))
+                        val (when has-val (impl/remove! buf))]
+                    (box val))
                   nil))
               (do
                 (if (> dirty-takes MAX_DIRTY)

src/main/clojure/cljs/core/async/impl/ioc_macros.clj

@@ -13,8 +13,6 @@
   (:refer-clojure :exclude [all])
   (:require [clojure.pprint :refer [pprint]]
             [clojure.set :refer (intersection)]
-            [clojure.core.async.impl.protocols :as impl]
-            [clojure.core.async.impl.dispatch :as dispatch]
             [cljs.analyzer :as cljs])
   (:import [cljs.tagged_literals JSValue]))
 

src/test/cljs/cljs/core/async/buffer_tests.cljs

@@ -7,12 +7,9 @@
 ;;   You must not remove this notice, or any other, from this software.
 
 (ns cljs.core.async.buffer-tests
-  (:require-macros [cljs.core.async.macros :as m :refer [go]])
   (:require [cljs.core.async
-             :refer [unblocking-buffer? buffer dropping-buffer sliding-buffer
-                     put! take! chan close!]]
-            [cljs.core.async.impl.dispatch :as dispatch]
-            [cljs.core.async.impl.buffers :as buff :refer [promise-buffer]]
+             :refer [unblocking-buffer? buffer dropping-buffer sliding-buffer]]
+            [cljs.core.async.impl.buffers :refer [promise-buffer]]
             [cljs.core.async.impl.protocols
              :refer [full? add! remove! close-buf!]]
             [cljs.core.async.test-helpers :refer-macros [throws?]]

src/test/cljs/cljs/core/async/pipeline_test.cljs

@@ -7,9 +7,9 @@
 ;;   You must not remove this notice, or any other, from this software.
 
 (ns cljs.core.async.pipeline-test
-  (:require-macros [cljs.core.async.macros :as m :refer [go go-loop]])
+  (:require-macros [cljs.core.async.macros :refer [go go-loop]])
   (:require [cljs.core.async.test-helpers :refer [latch inc!]]
-            [cljs.core.async :as a
+            [cljs.core.async
              :refer [<! >! chan close! to-chan! pipeline-async pipeline put!]]
             [cljs.test :refer-macros [deftest is testing async]]))
 
@@ -79,7 +79,7 @@
       (let [cout (chan 1)
             chex (chan 1)
             ex-mapping (map (fn [x] (if (= x 3) (throw (ex-info "err" {:data x})) x)))
-            ex-handler (fn [e] (do (put! chex e) :err))]
+            ex-handler (fn [e] (put! chex e) :err)]
         (pipeline 5 cout ex-mapping (to-chan! [1 2 3 4]) true ex-handler)
         (is (= 1 (<! cout)))
         (is (= 2 (<! cout)))

src/test/cljs/cljs/core/async/runner_tests.cljs

@@ -7,13 +7,10 @@
 ;;   You must not remove this notice, or any other, from this software.
 
 (ns cljs.core.async.runner-tests
-  (:require [cljs.core.async :refer [buffer dropping-buffer sliding-buffer put! take! chan close!]]
-            [cljs.core.async.impl.dispatch :as dispatch]
-            [cljs.core.async.impl.buffers :as buff]
-            [cljs.core.async.impl.protocols :refer [full? add! remove!]]
+  (:require [cljs.core.async.impl.protocols :refer [full? add! remove!]]
             [cljs.core.async.impl.ioc-helpers :as ioch])
-  (:require-macros [cljs.core.async.test-helpers :as h :refer [is= is deftest testing runner locals-test]]
-                   [cljs.core.async.macros :as m :refer [go]]
+  (:require-macros [cljs.core.async.test-helpers :refer [is= is deftest testing runner locals-test]]
+                   [cljs.core.async.macros :refer [go]]
                    [cljs.core.async.impl.ioc-macros :as ioc]))
 
 (defn pause [state blk val]

src/test/cljs/cljs/core/async/test_helpers.cljs

@@ -11,7 +11,7 @@
 (defn latch [m f]
   (let [r (atom 0)]
     (add-watch r :latch
-      (fn [_ _ o n]
+      (fn [_ _ _o n]
         (when (== n m) (f))))
     r))
 

src/test/cljs/cljs/core/async/tests.cljs

@@ -8,17 +8,14 @@
 
 (ns cljs.core.async.tests
   (:require-macros
-   [cljs.core.async.macros :as m :refer [go alt!]])
+   [cljs.core.async.macros :refer [go alt!]])
   (:require
    [cljs.core.async :refer
-    [buffer dropping-buffer sliding-buffer put! take! chan promise-chan
-     close! take partition-by offer! poll! <! >! alts!] :as async]
-   [cljs.core.async.impl.dispatch :as dispatch]
-   [cljs.core.async.impl.buffers :as buff]
-   [cljs.core.async.impl.timers :as timers :refer [timeout]]
-   [cljs.core.async.impl.protocols :refer [full? add! remove!]]
+    [put! take! chan promise-chan
+     close! offer! poll! <! >! alts!] :as async]
+   [cljs.core.async.impl.timers :refer [timeout]]
    [cljs.core.async.test-helpers :refer [latch inc!]]
-   [cljs.test :as test :refer-macros [deftest is run-tests async testing]]
+   [cljs.test :as test :refer-macros [deftest is async testing]]
    [goog.object :as gobj]))
 
 (enable-console-print!)