Skip to content

Commit 13f4787

Browse files
Use requiring-resolve where applicable
1 parent db47885 commit 13f4787

File tree

4 files changed

+7
-22
lines changed

4 files changed

+7
-22
lines changed

src/cider/nrepl/middleware/complete.clj

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,7 @@
1919

2020
(def suitable-complete-for-nrepl
2121
(when suitable-enabled?
22-
(require 'suitable.complete-for-nrepl)
23-
@(resolve 'suitable.complete-for-nrepl/complete-for-nrepl)))
22+
(requiring-resolve 'suitable.complete-for-nrepl/complete-for-nrepl)))
2423

2524
(def clj-sources
2625
"A list of Clojure completion sources for compliment."

src/cider/nrepl/middleware/util/error_handling.clj

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,11 @@
1414

1515
(def ^:private print-cause-trace
1616
(delay
17-
(do
18-
(require 'clojure.stacktrace)
19-
(resolve 'clojure.stacktrace/print-cause-trace))))
17+
(requiring-resolve 'clojure.stacktrace/print-cause-trace)))
2018

2119
(def ^:private analyze-causes
2220
(delay
23-
(do
24-
(require 'haystack.analyzer)
25-
(resolve 'haystack.analyzer/analyze))))
21+
(requiring-resolve 'haystack.analyzer/analyze)))
2622

2723
;;; UTILITY FUNCTIONS
2824

src/cider/nrepl/pprint.clj

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -47,10 +47,7 @@
4747
(apply pp/write value (mapcat identity (assoc options :stream writer)))))
4848

4949
(def ^:private fipp-printer
50-
(delay
51-
(do
52-
(require 'fipp.edn)
53-
(resolve 'fipp.edn/pprint))))
50+
(delay (requiring-resolve 'fipp.edn/pprint)))
5451

5552
(defn fipp-pprint
5653
([value writer]
@@ -60,10 +57,7 @@
6057
(@fipp-printer value options))))
6158

6259
(def ^:private puget-printer
63-
(delay
64-
(do
65-
(require 'puget.printer)
66-
(resolve 'puget.printer/pprint))))
60+
(delay (requiring-resolve 'puget.printer/pprint)))
6761

6862
(defn puget-pprint
6963
([value writer]
@@ -73,10 +67,7 @@
7367
(@puget-printer value options))))
7468

7569
(def ^:private zprint-printer
76-
(delay
77-
(do
78-
(require 'zprint.core)
79-
(resolve 'zprint.core/zprint))))
70+
(delay (requiring-resolve 'zprint.core/zprint)))
8071

8172
(defn zprint-pprint
8273
([value writer]

test/smoketest/src/smoketest/core.clj

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,7 @@
1414

1515
;; see cider-nrepl issue #447
1616
(defn nrepl-handler []
17-
(require 'cider.nrepl)
18-
(ns-resolve 'cider.nrepl 'cider-nrepl-handler))
17+
(requiring-resolve 'cider.nrepl/cider-nrepl-handler))
1918

2019
(defn nrepl-server-fixture
2120
"Derived from the cider-nrepl test fixture. Launch the nrepl server,

0 commit comments

Comments
 (0)