Move stdlib::os::errno to common

Author: coolreader18

common/src/crt_fd.rs

@@ -20,31 +20,10 @@ pub type Offset = libc::off_t;
 #[cfg(windows)]
 pub type Offset = libc::c_longlong;
 
-// copied from stdlib::os
-#[cfg(windows)]
-fn errno() -> io::Error {
-    let err = io::Error::last_os_error();
-    // FIXME: probably not ideal, we need a bigger dichotomy between GetLastError and errno
-    if err.raw_os_error() == Some(0) {
-        extern "C" {
-            fn _get_errno(pValue: *mut i32) -> i32;
-        }
-        let mut e = 0;
-        unsafe { suppress_iph!(_get_errno(&mut e)) };
-        io::Error::from_raw_os_error(e)
-    } else {
-        err
-    }
-}
-#[cfg(not(windows))]
-fn errno() -> io::Error {
-    io::Error::last_os_error()
-}
-
 #[inline]
 fn cvt<T, I: num_traits::PrimInt>(ret: I, f: impl FnOnce(I) -> T) -> io::Result<T> {
     if ret < I::zero() {
-        Err(errno())
+        Err(crate::os::errno())
     } else {
         Ok(f(ret))
     }

common/src/lib.rs

@@ -17,6 +17,7 @@ pub mod float_ops;
 pub mod hash;
 pub mod linked_list;
 pub mod lock;
+pub mod os;
 pub mod rc;
 pub mod refcount;
 pub mod static_cell;

common/src/os.rs

@@ -0,0 +1,23 @@
+// TODO: we can move more os-specific bindings/interfaces from stdlib::{os, posix, nt} to here
+
+use std::io;
+
+#[cfg(windows)]
+pub fn errno() -> io::Error {
+    let err = io::Error::last_os_error();
+    // FIXME: probably not ideal, we need a bigger dichotomy between GetLastError and errno
+    if err.raw_os_error() == Some(0) {
+        extern "C" {
+            fn _get_errno(pValue: *mut i32) -> i32;
+        }
+        let mut e = 0;
+        unsafe { suppress_iph!(_get_errno(&mut e)) };
+        io::Error::from_raw_os_error(e)
+    } else {
+        err
+    }
+}
+#[cfg(not(windows))]
+pub fn errno() -> io::Error {
+    io::Error::last_os_error()
+}

stdlib/src/socket.rs

@@ -1927,7 +1927,7 @@ mod _socket {
         use winapi::um::winsock2::closesocket as close;
         let ret = unsafe { close(x as _) };
         if ret < 0 {
-            let err = crate::vm::stdlib::os::errno();
+            let err = crate::common::os::errno();
             if err.raw_os_error() != Some(errcode!(ECONNRESET)) {
                 return Err(err.to_pyexception(vm));
             }

vm/src/stdlib/nt.rs

@@ -12,13 +12,12 @@ pub(crate) fn make_module(vm: &VirtualMachine) -> PyObjectRef {
 pub(crate) mod module {
     use crate::{
         builtins::{PyStrRef, PyTupleRef},
-        common::{crt_fd::Fd, suppress_iph},
+        common::{crt_fd::Fd, os::errno, suppress_iph},
         convert::ToPyException,
         function::Either,
         function::OptionalArg,
         stdlib::os::{
             errno_err, DirFd, FollowSymlinks, PyPathLike, SupportFunc, TargetIsDirectory, _os,
-            errno,
         },
         PyResult, TryFromObject, VirtualMachine,
     };

vm/src/stdlib/os.rs

@@ -288,23 +288,7 @@ impl ToPyException for IOErrorBuilder {
 /// Convert the error stored in the `errno` variable into an Exception
 #[inline]
 pub fn errno_err(vm: &VirtualMachine) -> PyBaseExceptionRef {
-    errno().to_pyexception(vm)
-}
-
-#[cfg(windows)]
-pub fn errno() -> io::Error {
-    let err = io::Error::last_os_error();
-    // FIXME: probably not ideal, we need a bigger dichotomy between GetLastError and errno
-    if err.raw_os_error() == Some(0) {
-        io::Error::from_raw_os_error(super::msvcrt::get_errno())
-    } else {
-        err
-    }
-}
-
-#[cfg(not(windows))]
-pub fn errno() -> io::Error {
-    io::Error::last_os_error()
+    crate::common::os::errno().to_pyexception(vm)
 }
 
 #[allow(dead_code)]