Fix compilation on redox

Author: coolreader18

Cargo.lock

@@ -27,7 +27,7 @@ clap = "2.33"
 rustpython-compiler = {path = "compiler", version = "0.1.1"}
 rustpython-parser = {path = "parser", version = "0.1.1"}
 rustpython-vm = {path = "vm", version = "0.1.1"}
-dirs = "=2.0.1"
+dirs = { package = "dirs-next", version = "1.0" }
 num-traits = "0.2.8"
 cfg-if = "0.1"
 
@@ -47,10 +47,8 @@ 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" }
-# nix = { git = "https://github.com/coolreader18/nix", branch = "add-redox-support" }
 # # following patches are just waiting on a new version to be released to crates.io
-# socket2 = { git = "https://github.com/alexcrichton/socket2-rs", rev = "75fe3f2fe0e3079ad9d4dfb3a19e60bea3f2f055" }
-# rustyline = { git = "https://github.com/kkawakam/rustyline" }
-# libc = { git = "https://github.com/rust-lang/libc" }
+# nix = { git = "https://github.com/nix-rust/nix" }
+# crossbeam-utils = { git = "https://github.com/crossbeam-rs/crossbeam" }
+# socket2 = { git = "https://github.com/alexcrichton/socket2-rs" }
 # REDOX END

Cargo.toml

@@ -2042,7 +2042,7 @@ impl<O: OutputStream> Compiler<O> {
 
         let mut compile_element = |element| {
             self.compile_expression(element).map_err(|e| {
-                if matches!(e.error, CompileErrorType::InvalidStarExpr) {
+                if let CompileErrorType::InvalidStarExpr = e.error {
                     self.error(CompileErrorType::SyntaxError(
                         "iterable unpacking cannot be used in comprehension".to_owned(),
                     ))

compiler/src/compile.rs

@@ -101,7 +101,7 @@ crc32fast = "1.2.0"
 adler32 = "1.0.3"
 gethostname = "0.2.0"
 subprocess = "0.2.2"
-socket2 = { version = "0.3", features = ["unix"] }
+socket2 = "0.3"
 rustyline = "6.0"
 openssl = { version = "0.10", features = ["vendored"], optional = true }
 openssl-sys = { version = "0.9", optional = true }

vm/Cargo.toml

@@ -9,6 +9,10 @@
 #![allow(clippy::wrong_self_convention, clippy::implicit_hasher)]
 #![doc(html_logo_url = "https://raw.githubusercontent.com/RustPython/RustPython/master/logo.png")]
 #![doc(html_root_url = "https://docs.rs/rustpython-vm/")]
+#![cfg_attr(
+    target_os = "redox",
+    feature(matches_macro, proc_macro_hygiene, result_map_or)
+)]
 
 #[cfg(feature = "flame-it")]
 #[macro_use]

vm/src/lib.rs

@@ -1314,10 +1314,18 @@ fn os_urandom(size: usize, vm: &VirtualMachine) -> PyResult<Vec<u8>> {
 #[cfg(any(target_os = "linux", target_os = "openbsd"))]
 type ModeT = u32;
 
+#[cfg(target_os = "redox")]
+type ModeT = i32;
+
 #[cfg(target_os = "macos")]
 type ModeT = u16;
 
-#[cfg(any(target_os = "macos", target_os = "linux", target_os = "openbsd"))]
+#[cfg(any(
+    target_os = "macos",
+    target_os = "linux",
+    target_os = "openbsd",
+    target_os = "redox"
+))]
 fn os_umask(mask: ModeT, _vm: &VirtualMachine) -> PyResult<ModeT> {
     let ret_mask = unsafe { libc::umask(mask) };
     Ok(ret_mask)
@@ -1455,6 +1463,7 @@ fn os_utime(
 
 #[cfg(unix)]
 fn os_sync(_vm: &VirtualMachine) -> PyResult<()> {
+    #[cfg(not(target_os = "redox"))]
     unsafe {
         libc::sync();
     }

vm/src/stdlib/os.rs

@@ -32,7 +32,21 @@ type RawSocket = std::os::unix::io::RawFd;
 type RawSocket = std::os::windows::raw::SOCKET;
 
 #[cfg(unix)]
-use libc as c;
+mod c {
+    pub use libc::*;
+    // https://gitlab.redox-os.org/redox-os/relibc/-/blob/master/src/header/netdb/mod.rs
+    #[cfg(target_os = "redox")]
+    pub const AI_PASSIVE: c_int = 0x01;
+    #[cfg(target_os = "redox")]
+    pub const AI_ALL: c_int = 0x10;
+    // https://gitlab.redox-os.org/redox-os/relibc/-/blob/master/src/header/sys_socket/constants.rs
+    #[cfg(target_os = "redox")]
+    pub const SO_TYPE: c_int = 3;
+    #[cfg(target_os = "redox")]
+    pub const MSG_OOB: c_int = 1;
+    #[cfg(target_os = "redox")]
+    pub const MSG_WAITALL: c_int = 256;
+}
 #[cfg(windows)]
 mod c {
     pub use winapi::shared::ws2def::*;
@@ -667,27 +681,26 @@ pub fn make_module(vm: &VirtualMachine) -> PyObjectRef {
         "SHUT_WR" => ctx.new_int(c::SHUT_WR),
         "SHUT_RDWR" => ctx.new_int(c::SHUT_RDWR),
         "MSG_PEEK" => ctx.new_int(c::MSG_PEEK),
+        "MSG_OOB" => ctx.new_int(c::MSG_OOB),
+        "MSG_WAITALL" => ctx.new_int(c::MSG_WAITALL),
         "IPPROTO_TCP" => ctx.new_int(c::IPPROTO_TCP),
         "IPPROTO_UDP" => ctx.new_int(c::IPPROTO_UDP),
         "IPPROTO_IP" => ctx.new_int(c::IPPROTO_IP),
         "IPPROTO_IPIP" => ctx.new_int(c::IPPROTO_IP),
         "IPPROTO_IPV6" => ctx.new_int(c::IPPROTO_IPV6),
         "SOL_SOCKET" => ctx.new_int(c::SOL_SOCKET),
         "SO_REUSEADDR" => ctx.new_int(c::SO_REUSEADDR),
-        "TCP_NODELAY" => ctx.new_int(c::TCP_NODELAY),
-        "SO_BROADCAST" => ctx.new_int(c::SO_BROADCAST),
         "SO_TYPE" => ctx.new_int(c::SO_TYPE),
+        "SO_BROADCAST" => ctx.new_int(c::SO_BROADCAST),
+        "TCP_NODELAY" => ctx.new_int(c::TCP_NODELAY),
+        "AI_ALL" => ctx.new_int(c::AI_ALL),
+        "AI_PASSIVE" => ctx.new_int(c::AI_PASSIVE),
     });
 
     #[cfg(not(target_os = "redox"))]
     extend_module!(vm, module, {
         "getaddrinfo" => ctx.new_function(socket_getaddrinfo),
         "gethostbyaddr" => ctx.new_function(socket_gethostbyaddr),
-        // non-redox constants
-        "MSG_OOB" => ctx.new_int(c::MSG_OOB),
-        "MSG_WAITALL" => ctx.new_int(c::MSG_WAITALL),
-        "AI_ALL" => ctx.new_int(c::AI_ALL),
-        "AI_PASSIVE" => ctx.new_int(c::AI_PASSIVE),
     });
 
     extend_module_platform_specific(vm, &module);