Update some old Map* to HMap

src/typed/core.clj

@@ -1522,6 +1522,7 @@
 (defonce RESTRICTED-CLASS (atom {}))
 
 (defn poly-RClass-from [class]
+  {:pre [(class? class)]}
   (let [rclass (@RESTRICTED-CLASS class)]
     (assert rclass (str class " not declared as polymorphic"))
     rclass))
@@ -1675,6 +1676,7 @@
 
 (defn parse-rinstance-type [[cls-sym & params-syn]]
   (let [cls (resolve cls-sym)
+        _ (assert (class? cls) (str cls-sym " cannot be resolved"))
         tparams (doall (map parse-type params-syn))]
     (RInstance-of cls tparams)))
 

test/typed/test/conduit.clj

@@ -7,23 +7,23 @@
 
 (def-alias ConduitMeta
   (U
-    (Map {:created-by (Value :disperse)
+    (HMap {:created-by (Value :disperse)
           :args Args
           :parts Parts})
-    (Map {:created-by (Value :a-arr)
+    (HMap {:created-by (Value :a-arr)
           :args Args})
-    (Map {:created-by (Value :a-comp)
+    (HMap {:created-by (Value :a-comp)
           :args Args
           :parts Parts})
-    (Map {:created-by (Value :a-nth)
+    (HMap {:created-by (Value :a-nth)
           :args Args
           :parts Parts})))
 
 
-(ann merge-parts [(IMeta (U (Map* :mandatory {:parts Any}) nil))
+(ann merge-parts [(IMeta (U (HMap {:parts Any}) nil))
                   -> (IPersistentMap Any Any)])
 (defn merge-parts [ps]
   (apply merge-with merge
-         (map (fn> [[a :- (IMeta (U (Map* :mandatory {:parts Any}) nil))]]
+         (map (fn> [[a :- (IMeta (U (HMap {:parts Any}) nil))]]
                    (-> a meta :parts))
               ps)))

test/typed/test/example.clj

@@ -15,9 +15,7 @@
 (defn test2 [a]
   ((inst map (U true false) Any) number? a))
 
-(ann use-map [(Map* :mandatory
-                    {:a Number})
-              -> Number])
+(ann use-map [(HMap {:a Number}) -> Number])
 (defn use-map [a]
   (get a :a))
 

test/typed/test/mm.clj

@@ -1,5 +1,6 @@
 (ns typed.test.mm
-  (:require [typed.core :as [ann]]))
+  (:import (clojure.lang IPersistentMap))
+  (:require [typed.core :refer [ann]]))
 
 (ann MapToString [(IPersistentMap Any Any) -> String])