Remove utils deftype macros

Author: cosineblast

.clj-kondo/config.edn

@@ -1,7 +1,4 @@
-{:lint-as {manifold.utils/definterface+ clojure.core/definterface
-           manifold.utils/deftype+ clojure.core/deftype
-           manifold.utils/defrecord+ clojure.core/defrecord
-           manifold.utils/defprotocol+ clojure.core/defprotocol}
+{:lint-as {manifold.utils/definterface+ clojure.core/definterface}
 
  :hooks {:analyze-call
          {manifold.stream.core/def-source manifold.hooks/def-sink-or-source

src/manifold/bus.clj

@@ -5,7 +5,8 @@
     [manifold
      [stream :as s]
      [deferred :as d]
-     [utils :refer [deftype+ definterface+]]])
+     [utils :refer [definterface+]]]
+    [potemkin.types :refer [deftype+]])
   (:import
     [java.util.concurrent
      ConcurrentHashMap]

src/manifold/deferred.clj

@@ -8,11 +8,11 @@
     [riddley.compiler :as compiler]
     [manifold
      [executor :as ex]
-     [utils :as utils :refer [defprotocol+ deftype+ definterface+]]
+     [utils :as utils :refer [definterface+]]
      [time :as time]
      [debug :as debug]]
     [clojure.set :as set]
-    [potemkin.types :refer [def-abstract-type reify+]])
+    [potemkin.types :refer [def-abstract-type reify+ defprotocol+ deftype+]])
   (:import
     [java.util
      LinkedList]
@@ -1388,9 +1388,9 @@
 (extend-protocol Deferrable
 
   CompletionStage
-  (to-deferred [f]
+  (to-deferred [cs]
     (let [d (deferred)]
-      (.handle ^CompletionStage f
+      (.handle ^CompletionStage cs
                (reify BiFunction
                  (apply [_ val err]
                    (if (nil? err)

src/manifold/stream.clj

@@ -6,7 +6,8 @@
   (:require
     [clojure.core :as clj]
     [manifold.deferred :as d]
-    [manifold.utils :as utils :refer [deftype+]]
+    [potemkin.types :refer [deftype+]]
+    [manifold.utils :as utils]
     [manifold.time :as time]
     [manifold.stream
      [core :as core]

src/manifold/stream/core.clj

@@ -1,6 +1,7 @@
 (ns manifold.stream.core
   {:no-doc true}
-  (:require [manifold.utils :refer [defprotocol+ definterface+ deftype+]]))
+  (:require [manifold.utils :refer [definterface+]]
+            [potemkin.types :refer [deftype+ defprotocol+]]))
 
 (defprotocol+ Sinkable
   (to-sink [_] "Provides a conversion mechanism to Manifold sinks."))

src/manifold/stream/default.clj

@@ -4,12 +4,13 @@
     [clojure.tools.logging :as log]
     [manifold
      [deferred :as d]
-     [utils :as utils :refer [deftype+ defrecord+]]
+     [utils :as utils]
      [executor :as ex]]
     [manifold.stream
      [graph :as g]
      [core :as s]]
-    [manifold.time :as time])
+    [manifold.time :as time]
+    [potemkin.types :refer [deftype+ defrecord+]])
   (:import
     [java.util
      LinkedList

src/manifold/stream/graph.clj

@@ -2,7 +2,8 @@
   {:no-doc true}
   (:require
     [manifold.deferred :as d]
-    [manifold.utils :as utils :refer [deftype+]]
+    [manifold.utils :as utils]
+    [potemkin.types :refer [deftype+]]
     [manifold.stream.core :as s]
     [manifold.executor :as ex]
     [clojure.tools.logging :as log])

src/manifold/time.clj

@@ -5,7 +5,8 @@
     [clojure.tools.logging :as log]
     [manifold.executor :as ex]
     [clojure.string :as str]
-    [manifold.utils :refer [definterface+ defprotocol+]])
+    [manifold.utils :refer [definterface+]]
+    [potemkin.types :refer [defprotocol+]])
   (:import
     [java.util
      Calendar

src/manifold/utils.clj

@@ -130,15 +130,6 @@
 
 ;;;
 
-(defmacro defprotocol+ [name & body]
-  `(potemkin.types/defprotocol+ ~name ~@body))
-
-(defmacro deftype+ [name & body]
-  `(potemkin.types/deftype+ ~name ~@body))
-
-(defmacro defrecord+ [name & body]
-  `(potemkin.types/defrecord+ ~name ~@body))
-
 (defmacro definterface+ [name & body]
   (when-not (resolve name)
     `(definterface ~name ~@body)))