Skip to content

Commit d54b9bf

Browse files
committed
CLJCLR-127: fix slurp argument warning
1 parent ffa49d1 commit d54b9bf

File tree

2 files changed

+2
-2
lines changed
  • Clojure
    • Clojure.Source/clojure
    • Clojure.Tests/clojure/test_clojure/clr

2 files changed

+2
-2
lines changed

Clojure/Clojure.Source/clojure/core.clj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7009,7 +7009,7 @@ clojure.lang.IKVReduce
70097009

70107010
(defn- normalize-slurp-opts
70117011
[opts]
7012-
(if (not (keyword? (first opts))) ;;; (string? (first opts))
7012+
(if (string? (first opts))
70137013
(do
70147014
(println "WARNING: (slurp f enc) is deprecated, use (slurp f :encoding enc).")
70157015
[:encoding (first opts)])

Clojure/Clojure.Tests/clojure/test_clojure/clr/io.clj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@
6161
(is (=
6262
(platform-newlines "WARNING: (slurp f enc) is deprecated, use (slurp f :encoding enc).\n")
6363
(with-out-str
64-
(is (= content (slurp f utf16))))))))))
64+
(is (= content (slurp f "utf-16"))))))))))
6565

6666
(deftest test-streams-defaults
6767
(let [f (temp-file "test-reader-writer")

0 commit comments

Comments
 (0)