From bef32f4f13bf777706fdaffe3dc775fd53b6c77d Mon Sep 17 00:00:00 2001 From: Lee Read Date: Sat, 24 Sep 2022 19:20:57 -0400 Subject: [PATCH] address clj-kondo warnings about type hints (#55) --- src/clojure/clj_yaml/core.clj | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/src/clojure/clj_yaml/core.clj b/src/clojure/clj_yaml/core.clj index 06eb3b6..c4cbdb2 100644 --- a/src/clojure/clj_yaml/core.clj +++ b/src/clojure/clj_yaml/core.clj @@ -16,17 +16,17 @@ :block DumperOptions$FlowStyle/BLOCK :flow DumperOptions$FlowStyle/FLOW}) -(defn ^DumperOptions default-dumper-options +(defn default-dumper-options "clj-yaml 0.5.6 used SnakeYAML 1.13 which by default did *not* split long lines. clj-yaml 0.6.0 upgraded to SnakeYAML 1.23 which by default *did* split long lines. This ensures that generate-string uses the older behavior by default, for the sake of stability, i.e. backwards compatibility." - [] + ^DumperOptions [] (doto (DumperOptions.) (.setSplitLines false))) -(defn ^DumperOptions make-dumper-options - [{:keys [flow-style indent indicator-indent]}] +(defn make-dumper-options + ^DumperOptions [{:keys [flow-style indent indicator-indent]}] (let [dumper (default-dumper-options)] (when flow-style (.setDefaultFlowStyle dumper (flow-styles flow-style))) @@ -36,12 +36,12 @@ (.setIndicatorIndent dumper indicator-indent)) dumper)) -(defn ^LoaderOptions default-loader-options - [] +(defn default-loader-options + ^LoaderOptions [] (LoaderOptions.)) -(defn ^LoaderOptions make-loader-options - [& {:keys [max-aliases-for-collections allow-recursive-keys allow-duplicate-keys]}] +(defn make-loader-options + ^LoaderOptions [& {:keys [max-aliases-for-collections allow-recursive-keys allow-duplicate-keys]}] (let [loader (default-loader-options)] (when max-aliases-for-collections (.setMaxAliasesForCollections loader max-aliases-for-collections)) @@ -51,9 +51,9 @@ (.setAllowDuplicateKeys loader allow-duplicate-keys)) loader)) -(defn ^Yaml make-yaml +(defn make-yaml "Make a yaml encoder/decoder with some given options." - [& {:keys [unknown-tag-fn dumper-options unsafe mark max-aliases-for-collections allow-recursive-keys allow-duplicate-keys]}] + ^Yaml [& {:keys [unknown-tag-fn dumper-options unsafe mark max-aliases-for-collections allow-recursive-keys allow-duplicate-keys]}] (let [loader (make-loader-options :max-aliases-for-collections max-aliases-for-collections :allow-recursive-keys allow-recursive-keys :allow-duplicate-keys allow-duplicate-keys)