From cadde5a2a03c67009ad32cb194205ea14a708223 Mon Sep 17 00:00:00 2001
From: Phil Hagelberg <technomancy@gmail.com>
Date: Mon, 21 Nov 2011 12:31:09 -0800
Subject: [PATCH] Drop deprecated arities of eval-in-project.

---
 leiningen-core/src/leiningen/core/eval.clj | 18 ++++++++++--------
 src/leiningen/run.clj                      |  5 ++---
 src/leiningen/test.clj                     |  2 +-
 3 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/leiningen-core/src/leiningen/core/eval.clj b/leiningen-core/src/leiningen/core/eval.clj
index 7625a6da..6db86ff9 100644
--- a/leiningen-core/src/leiningen/core/eval.clj
+++ b/leiningen-core/src/leiningen/core/eval.clj
@@ -159,11 +159,13 @@
   "Executes form in an isolated classloader with the classpath and compile path
   set correctly for the project. If the form depends on any requires, put them
   in the init arg to avoid the Gilardi Scenario: http://technomancy.us/143"
-  [project form & [handler skip-auto-compile init]]
-  (when skip-auto-compile
-    (println "WARNING: eval-in-project's skip-auto-compile arg is deprecated."))
-  (prep project skip-auto-compile)
-  (let [form-string (get-readable-form nil project form init)]
-    (if (:eval-in-leiningen project)
-      (eval-in-leiningen project form-string)
-      (eval-in-subprocess project form-string))))
+  ([project form init]
+     (prep project skip-auto-compile)
+     ;; might only make sense to stringify the form in :subprocess eval
+     (let [form-string (get-form-string project form init)]
+       ;; TODO: support :eval-in :leiningen, :subprocess, or :classloader (default)
+       ;; TODO: normalize old :eval-in-leiningen to new format in project/read
+       (if (:eval-in-leiningen project)
+         (eval-in-leiningen project form-string)
+         (eval-in-subprocess project form-string))))
+  ([project form] (eval-in-project project form nil)))
diff --git a/src/leiningen/run.clj b/src/leiningen/run.clj
index cb908642..2a35cecb 100644
--- a/src/leiningen/run.clj
+++ b/src/leiningen/run.clj
@@ -22,9 +22,8 @@
   ns/f, passing it the args."
   [project given & args]
   (eval-in-project project (run-form given args)
-                   nil nil `(try (require '~(symbol (namespace
-                                                     (normalize-main given))))
-                              (catch FileNotFoundException _#))))
+                   `(try (require '~(symbol (namespace (normalize-main given))))
+                         (catch FileNotFoundException _#))))
 
 (defn ^{:help-arglists '([])} run
   "Run the project's -main function.
diff --git a/src/leiningen/test.clj b/src/leiningen/test.clj
index 95bcf7a0..97714e97 100644
--- a/src/leiningen/test.clj
+++ b/src/leiningen/test.clj
@@ -74,7 +74,7 @@ selectors. With no arguments, runs all tests."
         result (doto (File/createTempFile "lein" "result") .deleteOnExit)]
     (eval-in-project project (form-for-testing-namespaces
                               nses (.getAbsolutePath result) (vec selectors))
-                     nil nil '(require 'clojure.test))
+                     '(require 'clojure.test))
     (if (and (.exists result) (pos? (.length result)))
       (let [summary (read-string (slurp (.getAbsolutePath result)))
             success? (zero? (+ (:error summary) (:fail summary)))]