Skip to content

Commit 3811756

Browse files
committed
remove inconsistent usage of :opts over :options key in the
compiler environment
1 parent 226b512 commit 3811756

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

src/clj/cljs/analyzer.clj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2060,7 +2060,7 @@
20602060
:requires (if (= ns-name 'cljs.core)
20612061
(set (vals deps))
20622062
(cond-> (conj (set (vals deps)) 'cljs.core)
2063-
(get-in compiler-env [:opts :emit-constants])
2063+
(get-in compiler-env [:options :emit-constants])
20642064
(conj 'constants-table)))
20652065
:file dest
20662066
:source-file src

src/clj/cljs/closure.clj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -561,7 +561,7 @@ should contain the source for the given namespace name."
561561
(javascript-file foreign url provides requires)
562562
js-map)))
563563
required-js)
564-
[(when (-> @env/*compiler* :opts :emit-constants)
564+
[(when (-> @env/*compiler* :options :emit-constants)
565565
(let [url (deps/to-url (str (util/output-directory opts) "/constants_table.js"))]
566566
(javascript-file nil url url ["constants-table"] ["cljs.core"] nil nil)))]
567567
required-cljs
@@ -1386,7 +1386,7 @@ should contain the source for the given namespace name."
13861386
(check-node-target opts)
13871387
(swap! compiler-env
13881388
#(-> %
1389-
(assoc-in [:opts :emit-constants] emit-constants)
1389+
(assoc-in [:options :emit-constants] emit-constants)
13901390
(assoc :target (:target opts))
13911391
(assoc :js-dependency-index (deps/js-dependency-index all-opts))))
13921392
(binding [comp/*dependents* (when-not (false? (:recompile-dependents opts))

src/clj/cljs/compiler.clj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,7 @@
197197
(emits ")")))
198198

199199
(defmethod emit-constant clojure.lang.Keyword [x]
200-
(if (-> @env/*compiler* :opts :emit-constants)
200+
(if (-> @env/*compiler* :options :emit-constants)
201201
(let [value (-> @env/*compiler* ::ana/constant-table x)]
202202
(emits "cljs.core." value))
203203
(emits-keyword x)
@@ -1019,7 +1019,7 @@
10191019
:requires (if (= ns-name 'cljs.core)
10201020
(set (vals deps))
10211021
(cond-> (conj (set (vals deps)) 'cljs.core)
1022-
(get-in @env/*compiler* [:opts :emit-constants])
1022+
(get-in @env/*compiler* [:options :emit-constants])
10231023
(conj 'constants-table)))
10241024
:file dest
10251025
:source-file src}

0 commit comments

Comments
 (0)