Skip to content

Commit c95aa0f

Browse files
committed
Move assert-some to utils ns
1 parent 58386ad commit c95aa0f

File tree

2 files changed

+10
-9
lines changed

2 files changed

+10
-9
lines changed

src/manifold/deferred.clj

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
[riddley.compiler :as compiler]
99
[manifold
1010
[executor :as ex]
11-
[utils :as utils :refer [definterface+]]
11+
[utils :as utils :refer [assert-some definterface+]]
1212
[time :as time]
1313
[debug :as debug]]
1414
[clojure.set :as set]
@@ -1536,14 +1536,6 @@
15361536
([d# d2# f# executor#]
15371537
(~fn-name (onto d# executor#) d2# f#)))))
15381538

1539-
(defmacro ^:no-doc assert-some
1540-
"Throws NullPointerException if any of the arguments is null."
1541-
[& values]
1542-
`(do ~@(for [value values]
1543-
`(let [value# ~value]
1544-
(when (nil? value#)
1545-
(throw (NullPointerException. ~(str value " was null"))))))))
1546-
15471539
(defn- fmap-deferred
15481540
"Like map/fmap but for deferreds.
15491541

src/manifold/utils.clj

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -152,3 +152,12 @@
152152
(defn fn->BiConsumer [f]
153153
(reify java.util.function.BiConsumer
154154
(accept [_ x y] (f x y))))
155+
156+
157+
(defmacro ^:no-doc assert-some
158+
"Throws NullPointerException if any of the arguments is null."
159+
[& values]
160+
`(do ~@(for [value values]
161+
`(let [value# ~value]
162+
(when (nil? value#)
163+
(throw (NullPointerException. ~(str value " was null"))))))))

0 commit comments

Comments
 (0)