Merge pull request RustPython#1359 from RustPython/coolreader18/redox-rustyline

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

@@ -24,12 +24,12 @@ sha2 = "0.8"
 sha3 = "0.8"
 blake2 = "0.8"
 
-num-complex = { version = "0.2", features = ["serde"] }
-num-bigint = { version = "0.2", features = ["serde"] }
-num-traits = "0.2.6"
-num-integer = "0.1.39"
-num-rational = "0.2.1"
-num-iter = "0.1"
+num-complex = { version = "0.2.2", features = ["serde"] }
+num-bigint = { version = "0.2.3", features = ["serde"] }
+num-traits = "0.2.8"
+num-integer = "0.1.41"
+num-rational = "0.2.2"
+num-iter = "0.1.39"
 rand = "0.5"
 log = "0.3"
 rustpython-derive = {path = "../derive", version = "0.1.0"}
@@ -43,7 +43,7 @@ regex = "1"
 rustc_version_runtime = "0.1.*"
 statrs = "0.10.0"
 caseless = "0.2.1"
-chrono = "=0.4.7"
+chrono = "=0.4.6"
 unicode-segmentation = "1.2.1"
 unicode-xid = "0.1.0"
 lazy_static = "^1.0.1"
@@ -83,6 +83,3 @@ num_cpus = "1.0"
 
 [target."cfg(windows)".dependencies]
 kernel32-sys = "0.2.2"
-
-[target.'cfg(target_arch = "wasm32")'.dependencies]
-wasm-bindgen = "0.2"

vm/Cargo.toml

@@ -131,7 +131,7 @@ impl PyFuncArgs {
     }
 
     pub fn take_keyword(&mut self, name: &str) -> Option<PyObjectRef> {
-        self.kwargs.remove(name)
+        self.kwargs.swap_remove(name)
     }
 
     pub fn remaining_keywords<'a>(

vm/src/function.rs

@@ -293,9 +293,12 @@ fn getgroups() -> nix::Result<Vec<Gid>> {
     }
 }
 
-#[cfg(any(target_os = "linux", target_os = "redox", target_os = "android"))]
+#[cfg(any(target_os = "linux", target_os = "android"))]
+use nix::unistd::getgroups;
+
+#[cfg(target_os = "redox")]
 fn getgroups() -> nix::Result<Vec<Gid>> {
-    nix::unistd::getgroups()
+    unimplemented!("redox getgroups")
 }
 
 #[cfg(unix)]
@@ -1229,7 +1232,15 @@ fn extend_module_platform_specific(vm: &VirtualMachine, module: PyObjectRef) ->
         "openpty" => ctx.new_rustfunc(os_openpty),
     });
 
-    #[cfg(not(target_os = "macos"))]
+    // cfg taken from nix
+    #[cfg(any(
+        target_os = "dragonfly",
+        target_os = "freebsd",
+        all(
+            target_os = "linux",
+            not(any(target_env = "musl", target_arch = "mips", target_arch = "mips64"))
+        )
+    ))]
     extend_module!(vm, module, {
         "SEEK_DATA" => ctx.new_int(Whence::SeekData as i8),
         "SEEK_HOLE" => ctx.new_int(Whence::SeekHole as i8)

vm/src/stdlib/os.rs

@@ -58,7 +58,7 @@ fn signal(signalnum: i32, handler: PyObjectRef, vm: &VirtualMachine) -> PyResult
     if old == SIG_ERR {
         return Err(vm.new_os_error("Failed to set signal".to_string()));
     }
-    #[cfg(unix)]
+    #[cfg(all(unix, not(target_os = "redox")))]
     {
         extern "C" {
             fn siginterrupt(sig: i32, flag: i32);