(opendal) branch main updated: chore(services/fs): use NotADirectory directly (#6786)

[asukaminato]

This is an automated email from the ASF dual-hosted git repository.

asukaminato pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/opendal.git


The following commit(s) were added to refs/heads/main by this push:
     new e9494dc63 chore(services/fs): use NotADirectory directly (#6786)
e9494dc63 is described below

commit e9494dc63c5e9f956717612d7bae779b32b61ace
Author: meteorgan <meteorite....@gmail.com>
AuthorDate: Mon Nov 17 02:29:43 2025 +0800

    chore(services/fs): use NotADirectory directly (#6786)
---
 core/src/services/fs/core.rs | 20 ++------------------
 1 file changed, 2 insertions(+), 18 deletions(-)

diff --git a/core/src/services/fs/core.rs b/core/src/services/fs/core.rs
index 0655e4226..e7d08670f 100644
--- a/core/src/services/fs/core.rs
+++ b/core/src/services/fs/core.rs
@@ -166,30 +166,14 @@ impl FsCore {
                 match e.kind() {
                     // Return empty list if the directory not found
                     std::io::ErrorKind::NotFound => Ok(None),
-                    // TODO: enable after our MSRV has been raised to 1.83
-                    //
                     // If the path is not a directory, return an empty list
                     //
                     // The path could be a file or a symbolic link in this 
case.
                     // Returning a NotADirectory error to the user isn't 
helpful; instead,
                     // providing an empty directory is a more user-friendly. 
In fact, the dir
                     // `path/` does not exist.
-                    // std::io::ErrorKind::NotADirectory => 
Ok((RpList::default(), None)),
-                    _ => {
-                        // TODO: remove this after we have MSRV 1.83
-                        #[cfg(unix)]
-                        if e.raw_os_error() == Some(20) {
-                            // On unix 20: Not a directory
-                            return Ok(None);
-                        }
-                        #[cfg(windows)]
-                        if e.raw_os_error() == Some(267) {
-                            // On windows 267: DIRECTORY
-                            return Ok(None);
-                        }
-
-                        Err(new_std_io_error(e))
-                    }
+                    std::io::ErrorKind::NotADirectory => Ok(None),
+                    _ => Err(new_std_io_error(e)),
                 }
             }
         }