Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Try canonicalisation when converting File to Dir #1018

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Try canonicalisation when converting File to Dir #1018

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 4 additions & 1 deletion src/fs/file.rs
View file
Open in desktop
Expand Up @@ -162,7 +162,10 @@ impl<'dir> File<'dir> {
/// Returns an IO error upon failure, but this shouldn’t be used to check
/// if a `File` is a directory or not! For that, just use `is_directory()`.
pub fn to_dir(&self) -> io::Result<Dir> {
Dir::read_dir(self.path.clone())
match self.path.canonicalize() {
Ok(path) => Dir::read_dir(path),
Err(_) => Dir::read_dir(self.path.clone()),
}
}

/// Whether this file is a regular file on the filesystem — that is, not a
Expand Down