Use the rustyline prompt on redox

Author: coolreader18

Cargo.lock

@@ -31,8 +31,7 @@ dirs = "2.0"
 flame = { version = "0.2", optional = true }
 flamescope = { version = "0.1", optional = true }
 
-[target.'cfg(not(target_os = "redox"))'.dependencies]
-rustyline = "4.1.0"
+rustyline = "=5.0.1"
 
 
 [dev-dependencies.cpython]
@@ -45,6 +44,5 @@ path = "src/main.rs"
 [patch.crates-io]
 # REDOX START, Uncommment when you want to compile/check with redoxer
 # time = { git = "https://gitlab.redox-os.org/redox-os/time.git", branch = "redox-unix" }
-# libc = { git = "https://github.com/AdminXVII/libc",	branch = "extra-traits-redox" }
 # nix = { git = "https://github.com/AdminXVII/nix",	branch = "add-redox-support" }
 # REDOX END

Cargo.toml

@@ -8,9 +8,7 @@ use clap::{App, AppSettings, Arg, ArgMatches};
 use rustpython_compiler::{compile, error::CompileError, error::CompileErrorType};
 use rustpython_parser::error::ParseErrorType;
 use rustpython_vm::{
-    import,
-    obj::objstr::PyStringRef,
-    print_exception,
+    import, print_exception,
     pyobject::{ItemProtocol, PyObjectRef, PyResult},
     scope::Scope,
     util, PySettings, VirtualMachine,
@@ -463,13 +461,6 @@ fn shell_exec(vm: &VirtualMachine, source: &str, scope: Scope) -> ShellExecResul
     }
 }
 
-fn get_prompt(vm: &VirtualMachine, prompt_name: &str) -> Option<PyStringRef> {
-    vm.get_attribute(vm.sys_module.clone(), prompt_name)
-        .and_then(|prompt| vm.to_str(&prompt))
-        .ok()
-}
-
-#[cfg(not(target_os = "redox"))]
 fn run_shell(vm: &VirtualMachine, scope: Scope) -> PyResult<()> {
     use rustyline::{error::ReadlineError, Editor};
 
@@ -505,14 +496,13 @@ fn run_shell(vm: &VirtualMachine, scope: Scope) -> PyResult<()> {
     let mut continuing = false;
 
     loop {
-        let prompt = if continuing {
-            get_prompt(vm, "ps2")
-        } else {
-            get_prompt(vm, "ps1")
-        };
+        let prompt_name = if continuing { "ps2" } else { "ps1" };
+        let prompt = vm
+            .get_attribute(vm.sys_module.clone(), prompt_name)
+            .and_then(|prompt| vm.to_str(&prompt));
         let prompt = match prompt {
-            Some(ref s) => s.as_str(),
-            None => "",
+            Ok(ref s) => s.as_str(),
+            Err(_) => "",
         };
         let result = match repl.readline(prompt) {
             Ok(line) => {
@@ -577,39 +567,3 @@ fn run_shell(vm: &VirtualMachine, scope: Scope) -> PyResult<()> {
 
     Ok(())
 }
-
-#[cfg(target_os = "redox")]
-fn run_shell(vm: &VirtualMachine, scope: Scope) -> PyResult<()> {
-    use std::io::{self, BufRead, Write};
-
-    println!(
-        "Welcome to the magnificent Rust Python {} interpreter!",
-        crate_version!()
-    );
-
-    fn print_prompt(vm: &VirtualMachine) {
-        let prompt = get_prompt(vm, "ps1");
-        let prompt = match prompt {
-            Some(ref s) => s.as_str(),
-            None => "",
-        };
-        print!("{}", prompt);
-        io::stdout().lock().flush().expect("flush failed");
-    }
-
-    let stdin = io::stdin();
-
-    print_prompt(vm);
-    for line in stdin.lock().lines() {
-        let mut line = line.expect("line failed");
-        line.push_str("\n");
-        match shell_exec(vm, &line, scope.clone()) {
-            ShellExecResult::Ok => {}
-            ShellExecResult::Continue => println!("Unexpected EOF"),
-            ShellExecResult::PyErr(exc) => print_exception(vm, &exc),
-        }
-        print_prompt(vm);
-    }
-
-    Ok(())
-}

src/main.rs

@@ -26,7 +26,7 @@ blake2 = "0.8"
 
 num-complex = { version = "0.2", features = ["serde"] }
 num-bigint = { version = "0.2", features = ["serde"] }
-num-traits = "0.2.6"
+num-traits = "=0.2.6"
 num-integer = "0.1.39"
 num-rational = "0.2.1"
 num-iter = "0.1"

vm/Cargo.toml

@@ -1229,7 +1229,7 @@ fn extend_module_platform_specific(vm: &VirtualMachine, module: PyObjectRef) ->
         "openpty" => ctx.new_rustfunc(os_openpty),
     });
 
-    #[cfg(not(target_os = "macos"))]
+    #[cfg(not(any(target_os = "macos", target_os = "android", target_os = "redox")))]
     extend_module!(vm, module, {
         "SEEK_DATA" => ctx.new_int(Whence::SeekData as i8),
         "SEEK_HOLE" => ctx.new_int(Whence::SeekHole as i8)