feat(libmd): drop readline

RossComputerGuy · Feb 8, 2025 · 3db2113 · 3db2113
1 parent 855582c
commit 3db2113
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 30 deletions.
diff --git a/src/libcmd/meson.build b/src/libcmd/meson.build
@@ -43,14 +43,6 @@ readline_flavor = get_option('readline-flavor')
 if readline_flavor == 'editline'
   editline = dependency('libeditline', 'editline', version : '>=1.14')
   deps_private += editline
-elif readline_flavor == 'readline'
-  readline = dependency('readline')
-  deps_private += readline
-  configdata.set(
-    'USE_READLINE',
-    1,
-    description: 'Use readline instead of editline',
-  )
 elif readline_flavor == 'zig'
   configdata.set(
     'USE_ZIG_REPL',

diff --git a/src/libcmd/meson.options b/src/libcmd/meson.options
@@ -9,7 +9,7 @@ option(
 option(
   'readline-flavor',
   type : 'combo',
-  choices : ['editline', 'readline', 'zig'],
-  value : 'editline',
+  choices : ['editline', 'zig'],
+  value : 'zig',
   description : 'Which library to use for nice line editing with the Nix language REPL',
 )
diff --git a/src/libcmd/package.nix b/src/libcmd/package.nix
@@ -10,7 +10,6 @@
   nix-flake,
   nix-main,
   editline,
-  readline,
   lowdown,
   nlohmann_json,
 
@@ -28,13 +27,7 @@
   #
   # - editline (default)
   # - readline
-  readlineFlavor ?
-    if stdenv.hostPlatform.isWindows then
-      "readline"
-    else if stdenv.hostPlatform.isLinux then
-      "zig"
-    else
-      "editline",
+  readlineFlavor ? if stdenv.hostPlatform.isLinux then "zig" else "editline",
 }:
 
 let
@@ -63,7 +56,7 @@ mkMesonLibrary (finalAttrs: {
   buildInputs = [
     (
       {
-        inherit editline readline;
+        inherit editline;
         zig = null;
       }
       .${readlineFlavor}

diff --git a/src/libcmd/repl-interacter.cc b/src/libcmd/repl-interacter.cc
@@ -1,9 +1,5 @@
 #include <cstdio>
 
-#ifdef USE_READLINE
-#include <readline/history.h>
-#include <readline/readline.h>
-#else
 #ifdef USE_ZIG_REPL
 extern "C" char* readline(const char* prompt);
 #else
@@ -16,7 +12,6 @@ extern "C" {
 #include <editline.h>
 }
 #endif
-#endif
 
 #include "signals.hh"
 #include "finally.hh"
@@ -39,7 +34,6 @@ void sigintHandler(int signo)
 
 static detail::ReplCompleterMixin * curRepl; // ugly
 
-#ifndef USE_READLINE
 static char * completionCallback(char * s, int * match)
 {
     auto possible = curRepl->completePrefix(s);
@@ -106,7 +100,6 @@ static int listPossibleCallback(char * s, char *** avp)
 
     return ac;
 }
-#endif
 
 ReadlineLikeInteracter::Guard ReadlineLikeInteracter::init(detail::ReplCompleterMixin * repl)
 {
@@ -119,7 +112,7 @@ ReadlineLikeInteracter::Guard ReadlineLikeInteracter::init(detail::ReplCompleter
     } catch (SystemError & e) {
         logWarning(e.info());
     }
-#if !defined(USE_READLINE) && !defined(USE_ZIG_REPL)
+#ifndef USE_ZIG_REPL
     el_hist_size = 1000;
 #endif
 #ifndef USE_ZIG_REPL
@@ -128,7 +121,7 @@ ReadlineLikeInteracter::Guard ReadlineLikeInteracter::init(detail::ReplCompleter
     auto oldRepl = curRepl;
     curRepl = repl;
     Guard restoreRepl([oldRepl] { curRepl = oldRepl; });
-#if !defined(USE_READLINE) && !defined(USE_ZIG_REPL)
+#ifndef USE_ZIG_REPL
     rl_set_complete_func(completionCallback);
     rl_set_list_possib_func(listPossibleCallback);
 #endif
@@ -191,11 +184,9 @@ bool ReadlineLikeInteracter::getLine(std::string & input, ReplPromptType promptT
     // quite useful for reading the test output, so we add it here.
     if (auto e = getEnv("_NIX_TEST_REPL_ECHO"); s && e && *e == "1")
     {
-#ifndef USE_READLINE
         // This is probably not right for multi-line input, but we don't use that
         // in the characterisation tests, so it's fine.
         std::cout << promptForType(promptType) << s << std::endl;
-#endif
     }
 
     if (!s)