rename PyPathLike -> OsPath becasue it is not a python object

Author: youknowone

stdlib/src/posixsubprocess.rs

@@ -1,7 +1,7 @@
 use crate::vm::{
     builtins::PyListRef,
     function::ArgSequence,
-    stdlib::{os::PyPathLike, posix},
+    stdlib::{os::OsPath, posix},
     {PyObjectRef, PyResult, TryFromObject, VirtualMachine},
 };
 use nix::{errno::Errno, unistd};
@@ -60,7 +60,7 @@ struct CStrPathLike {
 }
 impl TryFromObject for CStrPathLike {
     fn try_from_object(vm: &VirtualMachine, obj: PyObjectRef) -> PyResult<Self> {
-        let s = PyPathLike::try_from_object(vm, obj)?.into_cstring(vm)?;
+        let s = OsPath::try_from_object(vm, obj)?.into_cstring(vm)?;
         Ok(CStrPathLike { s })
     }
 }

vm/src/stdlib/io.rs

@@ -3541,7 +3541,7 @@ mod _io {
 
         // check file descriptor validity
         #[cfg(unix)]
-        if let Ok(crate::stdlib::os::PathOrFd::Fd(fd)) = file.clone().try_into_value(vm) {
+        if let Ok(crate::stdlib::os::OsPathOrFd::Fd(fd)) = file.clone().try_into_value(vm) {
             nix::fcntl::fcntl(fd, nix::fcntl::F_GETFD)
                 .map_err(|_| crate::stdlib::os::errno_err(vm))?;
         }

vm/src/stdlib/nt.rs

@@ -17,7 +17,7 @@ pub(crate) mod module {
         function::Either,
         function::OptionalArg,
         stdlib::os::{
-            errno_err, DirFd, FollowSymlinks, PyPathLike, SupportFunc, TargetIsDirectory, _os,
+            errno_err, DirFd, FollowSymlinks, OsPath, SupportFunc, TargetIsDirectory, _os,
         },
         PyResult, TryFromObject, VirtualMachine,
     };
@@ -35,7 +35,7 @@ pub(crate) mod module {
     use libc::{O_BINARY, O_TEMPORARY};
 
     #[pyfunction]
-    pub(super) fn access(path: PyPathLike, mode: u8, vm: &VirtualMachine) -> PyResult<bool> {
+    pub(super) fn access(path: OsPath, mode: u8, vm: &VirtualMachine) -> PyResult<bool> {
         use um::{fileapi, winnt};
         let attr = unsafe { fileapi::GetFileAttributesW(path.to_widecstring(vm)?.as_ptr()) };
         Ok(attr != fileapi::INVALID_FILE_ATTRIBUTES
@@ -46,8 +46,8 @@ pub(crate) mod module {
 
     #[derive(FromArgs)]
     pub(super) struct SymlinkArgs {
-        src: PyPathLike,
-        dst: PyPathLike,
+        src: OsPath,
+        dst: OsPath,
         #[pyarg(flatten)]
         target_is_directory: TargetIsDirectory,
         #[pyarg(flatten)]
@@ -90,7 +90,7 @@ pub(crate) mod module {
 
     #[pyfunction]
     fn chmod(
-        path: PyPathLike,
+        path: OsPath,
         dir_fd: DirFd<0>,
         mode: u32,
         follow_symlinks: FollowSymlinks,
@@ -239,7 +239,7 @@ pub(crate) mod module {
     }
 
     #[pyfunction]
-    fn _getfinalpathname(path: PyPathLike, vm: &VirtualMachine) -> PyResult {
+    fn _getfinalpathname(path: OsPath, vm: &VirtualMachine) -> PyResult {
         let real = path
             .as_ref()
             .canonicalize()
@@ -248,7 +248,7 @@ pub(crate) mod module {
     }
 
     #[pyfunction]
-    fn _getfullpathname(path: PyPathLike, vm: &VirtualMachine) -> PyResult {
+    fn _getfullpathname(path: OsPath, vm: &VirtualMachine) -> PyResult {
         let wpath = path.to_widecstring(vm)?;
         let mut buffer = vec![0u16; winapi::shared::minwindef::MAX_PATH];
         let ret = unsafe {
@@ -281,7 +281,7 @@ pub(crate) mod module {
     }
 
     #[pyfunction]
-    fn _getvolumepathname(path: PyPathLike, vm: &VirtualMachine) -> PyResult {
+    fn _getvolumepathname(path: OsPath, vm: &VirtualMachine) -> PyResult {
         let wide = path.to_widecstring(vm)?;
         let buflen = std::cmp::max(wide.len(), winapi::shared::minwindef::MAX_PATH);
         let mut buffer = vec![0u16; buflen];
@@ -296,7 +296,7 @@ pub(crate) mod module {
     }
 
     #[pyfunction]
-    fn _path_splitroot(path: PyPathLike, vm: &VirtualMachine) -> PyResult<(String, String)> {
+    fn _path_splitroot(path: OsPath, vm: &VirtualMachine) -> PyResult<(String, String)> {
         let orig: Vec<_> = path.path.into_os_string().encode_wide().collect();
         if orig.is_empty() {
             return Ok(("".to_owned(), "".to_owned()));
@@ -334,7 +334,7 @@ pub(crate) mod module {
     }
 
     #[pyfunction]
-    fn _getdiskusage(path: PyPathLike, vm: &VirtualMachine) -> PyResult<(u64, u64)> {
+    fn _getdiskusage(path: OsPath, vm: &VirtualMachine) -> PyResult<(u64, u64)> {
         use um::fileapi::GetDiskFreeSpaceExW;
         use winapi::shared::{ntdef::ULARGE_INTEGER, winerror};
 
@@ -399,7 +399,7 @@ pub(crate) mod module {
 
     #[pyfunction]
     fn mkdir(
-        path: PyPathLike,
+        path: OsPath,
         mode: OptionalArg<i32>,
         dir_fd: DirFd<{ _os::MKDIR_DIR_FD as usize }>,
         vm: &VirtualMachine,