Update nix and rustyline

Cargo.lock

@@ -1002,7 +1002,7 @@ version = "1.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "df1d1bc1084549d60725ccc53a2bfa07f67fe4689fda07b05a36531f2988104a"
 dependencies = [
- "nix",
+ "nix 0.23.1",
  "winapi",
 ]
 
@@ -1100,6 +1100,18 @@ dependencies = [
  "memoffset",
 ]
 
+[[package]]
+name = "nix"
+version = "0.24.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "195cdbc1741b8134346d515b3a56a1c94b0912758009cfd53f99ea0f57b065fc"
+dependencies = [
+ "bitflags",
+ "cfg-if",
+ "libc",
+ "memoffset",
+]
+
 [[package]]
 name = "num-bigint"
 version = "0.4.3"
@@ -1789,7 +1801,7 @@ dependencies = [
  "memchr",
  "memmap2",
  "mt19937",
- "nix",
+ "nix 0.24.2",
  "num-bigint",
  "num-complex",
  "num-integer",
@@ -1860,7 +1872,7 @@ dependencies = [
  "log",
  "memchr",
  "memoffset",
- "nix",
+ "nix 0.24.2",
  "num-bigint",
  "num-complex",
  "num-integer",
@@ -1934,9 +1946,9 @@ checksum = "61b3909d758bb75c79f23d4736fac9433868679d3ad2ea7a61e3c25cfda9a088"
 
 [[package]]
 name = "rustyline"
-version = "9.1.2"
+version = "10.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "db7826789c0e25614b03e5a54a0717a86f9ff6e6e5247f92b369472869320039"
+checksum = "1d1cd5ae51d3f7bf65d7969d579d502168ef578f289452bd8ccc91de28fda20e"
 dependencies = [
  "bitflags",
  "cfg-if",
@@ -1946,10 +1958,9 @@ dependencies = [
  "libc",
  "log",
  "memchr",
- "nix",
+ "nix 0.24.2",
  "radix_trie",
  "scopeguard",
- "smallvec",
  "unicode-segmentation",
  "unicode-width",
  "utf8parse",

Cargo.toml

@@ -49,7 +49,7 @@ flame = { version = "0.2.2", optional = true }
 flamescope = { version = "0.1.2", optional = true }
 
 [target.'cfg(not(target_arch = "wasm32"))'.dependencies]
-rustyline = "9.1.2"
+rustyline = "10.0.0"
 
 [dev-dependencies]
 cpython = "0.7.0"

src/shell.rs

@@ -112,10 +112,6 @@ pub fn run_shell(vm: &VirtualMachine, scope: Scope) -> PyResult<()> {
             ReadlineResult::Eof => {
                 break;
             }
-            ReadlineResult::EncodingError => {
-                eprintln!("Invalid UTF-8 entered");
-                Ok(())
-            }
             ReadlineResult::Other(err) => {
                 eprintln!("Readline error: {:?}", err);
                 break;

stdlib/Cargo.toml

@@ -56,7 +56,7 @@ base64 = "0.13.0"
 csv-core = "0.1.10"
 hex = "0.4.3"
 puruspe = "0.1.5"
-nix = "0.23.1"
+nix = "0.24"
 xml-rs = "0.8.4"
 libc = "0.2.126"
 cfg-if = "1.0.0"

stdlib/src/socket.rs

@@ -2084,7 +2084,7 @@ mod _socket {
     fn if_nameindex(vm: &VirtualMachine) -> PyResult<Vec<PyObjectRef>> {
         #[cfg(not(windows))]
         {
-            let list = if_nameindex()
+            let list = nix::net::if_::if_nameindex()
                 .map_err(|err| err.into_pyexception(vm))?
                 .to_slice()
                 .iter()
@@ -2095,55 +2095,7 @@ mod _socket {
                 })
                 .collect();
 
-            return Ok(list);
-
-            // all the stuff below should be in nix soon, hopefully
-
-            use ffi::CStr;
-            use std::ptr::NonNull;
-
-            #[repr(transparent)]
-            struct Interface(libc::if_nameindex);
-
-            impl Interface {
-                fn index(&self) -> libc::c_uint {
-                    self.0.if_index
-                }
-                fn name(&self) -> &CStr {
-                    unsafe { CStr::from_ptr(self.0.if_name) }
-                }
-            }
-
-            struct Interfaces {
-                ptr: NonNull<libc::if_nameindex>,
-            }
-
-            impl Interfaces {
-                fn to_slice(&self) -> &[Interface] {
-                    let ifs = self.ptr.as_ptr() as *const Interface;
-                    let mut len = 0;
-                    unsafe {
-                        while (*ifs.add(len)).0.if_index != 0 {
-                            len += 1
-                        }
-                        std::slice::from_raw_parts(ifs, len)
-                    }
-                }
-            }
-
-            impl Drop for Interfaces {
-                fn drop(&mut self) {
-                    unsafe { libc::if_freenameindex(self.ptr.as_ptr()) };
-                }
-            }
-
-            fn if_nameindex() -> nix::Result<Interfaces> {
-                unsafe {
-                    let ifs = libc::if_nameindex();
-                    let ptr = NonNull::new(ifs).ok_or_else(nix::Error::last)?;
-                    Ok(Interfaces { ptr })
-                }
-            }
+            Ok(list)
         }
         #[cfg(windows)]
         {

vm/Cargo.toml

@@ -50,7 +50,7 @@ indexmap = "1.8.1"
 ahash = "0.7.6"
 bitflags = "1.3.2"
 libc = "0.2.126"
-nix = "0.23.1"
+nix = "0.24.2"
 paste = "1.0.7"
 is-macro = "0.2.0"
 result-like = "0.4.5"
@@ -101,7 +101,7 @@ strum = "0.24.0"
 strum_macros = "0.24.0"
 
 [target.'cfg(not(target_arch = "wasm32"))'.dependencies]
-rustyline = "9"
+rustyline = "10.0.0"
 which = "4.2.5"
 
 [target.'cfg(any(not(target_arch = "wasm32"), target_os = "wasi"))'.dependencies]

vm/src/readline.rs

@@ -8,7 +8,6 @@ pub enum ReadlineResult {
     Eof,
     Interrupt,
     Io(std::io::Error),
-    EncodingError,
     Other(OtherError),
 }
 
@@ -51,11 +50,8 @@ mod basic_readline {
             match next_line {
                 Some(Ok(line)) => ReadlineResult::Line(line),
                 None => ReadlineResult::Eof,
-                Some(Err(e)) => match e.kind() {
-                    io::ErrorKind::Interrupted => ReadlineResult::Interrupt,
-                    io::ErrorKind::InvalidData => ReadlineResult::EncodingError,
-                    _ => ReadlineResult::Io(e),
-                },
+                Some(Err(e)) if e.kind() == io::ErrorKind::Interrupted => ReadlineResult::Interrupt,
+                Some(Err(e)) => ReadlineResult::Io(e),
             }
         }
     }
@@ -82,7 +78,8 @@ mod rustyline_readline {
                     .tab_stop(8)
                     .bracketed_paste(false) // multi-line paste
                     .build(),
-            );
+            )
+            .expect("failed to initialize line editor");
             repl.set_helper(Some(helper));
             Readline { repl }
         }
@@ -109,16 +106,15 @@ mod rustyline_readline {
 
         pub fn readline(&mut self, prompt: &str) -> ReadlineResult {
             use rustyline::error::ReadlineError;
-            match self.repl.readline(prompt) {
-                Ok(line) => ReadlineResult::Line(line),
-                Err(ReadlineError::Interrupted) => ReadlineResult::Interrupt,
-                Err(ReadlineError::Eof) => ReadlineResult::Eof,
-                Err(ReadlineError::Io(e)) => ReadlineResult::Io(e),
-                #[cfg(unix)]
-                Err(ReadlineError::Utf8Error) => ReadlineResult::EncodingError,
-                #[cfg(windows)]
-                Err(ReadlineError::Decode(_)) => ReadlineResult::EncodingError,
-                Err(e) => ReadlineResult::Other(e.into()),
+            loop {
+                break match self.repl.readline(prompt) {
+                    Ok(line) => ReadlineResult::Line(line),
+                    Err(ReadlineError::Interrupted) => ReadlineResult::Interrupt,
+                    Err(ReadlineError::Eof) => ReadlineResult::Eof,
+                    Err(ReadlineError::Io(e)) => ReadlineResult::Io(e),
+                    Err(ReadlineError::WindowResized) => continue,
+                    Err(e) => ReadlineResult::Other(e.into()),
+                };
             }
         }
     }

vm/src/stdlib/builtins.rs

@@ -402,9 +402,6 @@ mod builtins {
                     Err(vm.new_exception_empty(vm.ctx.exceptions.keyboard_interrupt.to_owned()))
                 }
                 ReadlineResult::Io(e) => Err(vm.new_os_error(e.to_string())),
-                ReadlineResult::EncodingError => {
-                    Err(vm.new_unicode_decode_error("Error decoding readline input".to_owned()))
-                }
                 ReadlineResult::Other(e) => Err(vm.new_runtime_error(e.to_string())),
             }
         } else {