Remove the Rhino stuff

It's no longer supported upstream by piggieback.

2 files changed, 4 insertions, 5 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 83a0d4dc..155fd494 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -41,6 +41,8 @@
 * [#2202](https://github.com/clojure-emacs/cider/issues/2202): Don't try to start a ClojureScript REPL before checking whether that's possible or not.
 * [orchard#24](https://github.com/clojure-emacs/orchard/pull/24): Inspector now separately renders clickable keys and values when inspecting maps.
 * [orchard#24](https://github.com/clojure-emacs/orchard/pull/24): Inspector now remembers the current page of each level of nesting when navigating big and nested collection.
+* Require piggieback 0.3 or newer.
+* Drops support for Rhino in favour of the modern Nashorn.
 
 ## 0.16.0 (2017-12-28)
 
diff --git a/cider.el b/cider.el
index a5dcb4fd..172449d1 100644
--- a/cider.el
+++ b/cider.el
@@ -670,9 +670,7 @@ The supplied string will be wrapped in a do form if needed."
       (format "(do %s)" form))))
 
 (defvar cider-cljs-repl-types
-  '(("Rhino" "(cemerick.piggieback/cljs-repl (cljs.repl.rhino/repl-env))"
-     nil)
-    ("Nashorn" "(cemerick.piggieback/cljs-repl (cljs.repl.nashorn/repl-env))"
+  '(("Nashorn" "(cemerick.piggieback/cljs-repl (cljs.repl.nashorn/repl-env))"
      cider-check-nashorn-requirements)
     ("Figwheel" "(do (require 'figwheel-sidecar.repl-api) (figwheel-sidecar.repl-api/start-figwheel!) (figwheel-sidecar.repl-api/cljs-repl))"
      cider-check-figwheel-requirements)
@@ -718,8 +716,7 @@ This affects commands like `cider-jack-in-clojurescript'.  Generally it's
 intended to be set via .dir-locals.el for individual projects, as its
 relatively unlikely you'd like to use the same type of REPL in each project
 you're working on."
-  :type '(choice (const "Rhino")
-                 (const "Nashorn")
+  :type '(choice (const "Nashorn")
                  (const "Figwheel")
                  (const "Node")
                  (const "Weasel")