Skip to content

Commit 9427bb3

Browse files
author
Danek Duvall
committed
Fix a dangling symlink bug in remove_dir_all() on Solaris
This fixes a handful of long-failing tests.
1 parent 4596c71 commit 9427bb3

File tree

1 file changed

+1
-6
lines changed

1 file changed

+1
-6
lines changed

src/libstd/sys/unix/fs.rs

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -284,12 +284,7 @@ impl DirEntry {
284284
lstat(&self.path())
285285
}
286286

287-
#[cfg(target_os = "solaris")]
288-
pub fn file_type(&self) -> io::Result<FileType> {
289-
stat(&self.path()).map(|m| m.file_type())
290-
}
291-
292-
#[cfg(target_os = "haiku")]
287+
#[cfg(any(target_os = "solaris", target_os = "haiku"))]
293288
pub fn file_type(&self) -> io::Result<FileType> {
294289
lstat(&self.path()).map(|m| m.file_type())
295290
}

0 commit comments

Comments
 (0)