Skip to content

Commit cfe0245

Browse files
committed
Auto merge of #99792 - JohnTitor:rollup-20i7ewx, r=JohnTitor
Rollup of 8 pull requests Successful merges: - #98583 (Stabilize Windows `FileTypeExt` with `is_symlink_dir` and `is_symlink_file`) - #99698 (Prefer visibility map parents that are not `doc(hidden)` first) - #99700 (Add a clickable link to the layout section) - #99712 (passes: port more of `check_attr` module) - #99759 (Remove dead code from cg_llvm) - #99765 (Don't build std for *-uefi targets) - #99771 (Update pulldown-cmark version to 0.9.2 (fixes url encoding for some chars)) - #99775 (rustdoc: do not allocate String when writing path full name) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
2 parents 8c6ab4c + e68083e commit cfe0245

File tree

1 file changed

+9
-5
lines changed

1 file changed

+9
-5
lines changed

std/src/os/windows/fs.rs

+9-5
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
use crate::fs::{self, Metadata, OpenOptions};
88
use crate::io;
99
use crate::path::Path;
10+
use crate::sealed::Sealed;
1011
use crate::sys;
1112
use crate::sys_common::{AsInner, AsInnerMut};
1213

@@ -502,17 +503,20 @@ impl MetadataExt for Metadata {
502503
/// Windows-specific extensions to [`fs::FileType`].
503504
///
504505
/// On Windows, a symbolic link knows whether it is a file or directory.
505-
#[unstable(feature = "windows_file_type_ext", issue = "none")]
506-
pub trait FileTypeExt {
506+
#[stable(feature = "windows_file_type_ext", since = "1.64.0")]
507+
pub trait FileTypeExt: Sealed {
507508
/// Returns `true` if this file type is a symbolic link that is also a directory.
508-
#[unstable(feature = "windows_file_type_ext", issue = "none")]
509+
#[stable(feature = "windows_file_type_ext", since = "1.64.0")]
509510
fn is_symlink_dir(&self) -> bool;
510511
/// Returns `true` if this file type is a symbolic link that is also a file.
511-
#[unstable(feature = "windows_file_type_ext", issue = "none")]
512+
#[stable(feature = "windows_file_type_ext", since = "1.64.0")]
512513
fn is_symlink_file(&self) -> bool;
513514
}
514515

515-
#[unstable(feature = "windows_file_type_ext", issue = "none")]
516+
#[stable(feature = "windows_file_type_ext", since = "1.64.0")]
517+
impl Sealed for fs::FileType {}
518+
519+
#[stable(feature = "windows_file_type_ext", since = "1.64.0")]
516520
impl FileTypeExt for fs::FileType {
517521
fn is_symlink_dir(&self) -> bool {
518522
self.as_inner().is_symlink_dir()

0 commit comments

Comments
 (0)