Merge pull request RustPython#1340 from RustPython/coolreader18/windows-improvements

Improve UX on windows

Author: coolreader18

Cargo.lock

@@ -20,13 +20,13 @@ flame-it = ["rustpython-vm/flame-it", "flame", "flamescope"]
 freeze-stdlib = ["rustpython-vm/freeze-stdlib"]
 
 [dependencies]
-log="0.4.1"
-env_logger="0.5.10"
-clap = "2.31.2"
+log = "0.4"
+env_logger = "0.6"
+clap = "2.33"
 rustpython-compiler = {path = "compiler", version = "0.1.0"}
 rustpython-parser = {path = "parser", version = "0.1.0"}
 rustpython-vm = {path = "vm", version = "0.1.0"}
-xdg = "2.2.0"
+dirs = "2.0"
 
 flame = { version = "0.2", optional = true }
 flamescope = { version = "0.1", optional = true }

Cargo.toml

@@ -463,21 +463,6 @@ fn shell_exec(vm: &VirtualMachine, source: &str, scope: Scope) -> ShellExecResul
     }
 }
 
-#[cfg(not(unix))]
-fn get_history_path() -> PathBuf {
-    PathBuf::from(".repl_history.txt")
-}
-
-#[cfg(unix)]
-fn get_history_path() -> PathBuf {
-    //work around for windows dependent builds. The xdg crate is unix specific
-    //so access to the BaseDirectories struct breaks builds on python.
-    extern crate xdg;
-
-    let xdg_dirs = xdg::BaseDirectories::with_prefix("rustpython").unwrap();
-    xdg_dirs.place_cache_file("repl_history.txt").unwrap()
-}
-
 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))
@@ -498,8 +483,22 @@ fn run_shell(vm: &VirtualMachine, scope: Scope) -> PyResult<()> {
     let mut repl = Editor::<()>::new();
 
     // Retrieve a `history_path_str` dependent on the OS
-    let repl_history_path_str = &get_history_path();
-    if repl.load_history(repl_history_path_str).is_err() {
+    let repl_history_path = match dirs::config_dir() {
+        Some(mut path) => {
+            path.push("rustpython");
+            path.push("repl_history.txt");
+            path
+        }
+        None => ".repl_history.txt".into(),
+    };
+
+    if !repl_history_path.exists() {
+        if let Some(parent) = repl_history_path.parent() {
+            std::fs::create_dir_all(parent).unwrap();
+        }
+    }
+
+    if repl.load_history(&repl_history_path).is_err() {
         println!("No previous history.");
     }
 
@@ -540,21 +539,22 @@ fn run_shell(vm: &VirtualMachine, scope: Scope) -> PyResult<()> {
 
                 match shell_exec(vm, &input, scope.clone()) {
                     ShellExecResult::Ok => {
-                        input = String::new();
+                        input.clear();
                         Ok(())
                     }
                     ShellExecResult::Continue => {
                         continuing = true;
                         Ok(())
                     }
                     ShellExecResult::PyErr(err) => {
-                        input = String::new();
+                        input.clear();
                         Err(err)
                     }
                 }
             }
             Err(ReadlineError::Interrupted) => {
                 continuing = false;
+                input.clear();
                 let keyboard_interrupt = vm
                     .new_empty_exception(vm.ctx.exceptions.keyboard_interrupt.clone())
                     .unwrap();
@@ -573,7 +573,7 @@ fn run_shell(vm: &VirtualMachine, scope: Scope) -> PyResult<()> {
             print_exception(vm, &exc);
         }
     }
-    repl.save_history(repl_history_path_str).unwrap();
+    repl.save_history(&repl_history_path).unwrap();
 
     Ok(())
 }

src/main.rs

@@ -1,9 +1,9 @@
 use num_cpus;
 use std::cell::RefCell;
-use std::ffi::CStr;
+use std::ffi;
 use std::fs::File;
 use std::fs::OpenOptions;
-use std::io::{self, Error, ErrorKind, Read, Write};
+use std::io::{self, ErrorKind, Read, Write};
 use std::time::{Duration, SystemTime};
 use std::{env, fs};
 
@@ -53,11 +53,10 @@ pub fn raw_file_number(handle: File) -> i64 {
 
 #[cfg(windows)]
 pub fn rust_file(raw_fileno: i64) -> File {
-    use std::ffi::c_void;
     use std::os::windows::io::FromRawHandle;
 
     //This seems to work as expected but further testing is required.
-    unsafe { File::from_raw_handle(raw_fileno as *mut c_void) }
+    unsafe { File::from_raw_handle(raw_fileno as *mut ffi::c_void) }
 }
 
 #[cfg(all(not(unix), not(windows)))]
@@ -1021,9 +1020,9 @@ pub fn os_ttyname(fd: PyIntRef, vm: &VirtualMachine) -> PyResult {
     if let Some(fd) = fd.as_bigint().to_i32() {
         let name = unsafe { ttyname(fd) };
         if name.is_null() {
-            Err(vm.new_os_error(Error::last_os_error().to_string()))
+            Err(vm.new_os_error(io::Error::last_os_error().to_string()))
         } else {
-            let name = unsafe { CStr::from_ptr(name) }.to_str().unwrap();
+            let name = unsafe { ffi::CStr::from_ptr(name) }.to_str().unwrap();
             Ok(vm.ctx.new_str(name.to_owned()))
         }
     } else {
@@ -1096,6 +1095,7 @@ pub fn make_module(vm: &VirtualMachine) -> PyObjectRef {
             }
         }
     }
+    #[allow(unused_mut)]
     let mut support_funcs = vec![
         SupportFunc::new(vm, "open", os_open, None, Some(false), None),
         // access Some Some None

vm/src/stdlib/os.rs

@@ -1,11 +1,8 @@
-use crate::obj::objint::PyIntRef;
 use crate::pyobject::{PyObjectRef, PyResult, TryFromObject};
 use crate::vm::{VirtualMachine, NSIG};
 
 use std::sync::atomic::{AtomicBool, Ordering};
 
-use num_traits::cast::ToPrimitive;
-
 use arr_macro::arr;
 
 #[cfg(unix)]
@@ -85,8 +82,7 @@ fn getsignal(signalnum: i32, vm: &VirtualMachine) -> PyResult<PyObjectRef> {
 }
 
 #[cfg(unix)]
-fn alarm(time: PyIntRef, _vm: &VirtualMachine) -> u32 {
-    let time = time.as_bigint().to_u32().unwrap();
+fn alarm(time: u32, _vm: &VirtualMachine) -> u32 {
     let prev_time = if time == 0 {
         sig_alarm::cancel()
     } else {