diff options
| author | bors <bors@rust-lang.org> | 2022-07-27 04:18:49 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2022-07-27 04:18:49 +0000 |
| commit | e33cc71a61c91e1d510bf283e9d345067e64eed2 (patch) | |
| tree | 17c9c1bf9b1c7f77be51a944a515a275f4b3ac6f /library/std/src | |
| parent | b573e10d21b69ebfadf41aa9c2f0a27919fe4480 (diff) | |
| parent | 0d5bdcac5ff0c5cbc6ed0a04663788a23cc62adf (diff) | |
| download | rust-e33cc71a61c91e1d510bf283e9d345067e64eed2.tar.gz rust-e33cc71a61c91e1d510bf283e9d345067e64eed2.zip | |
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
Diffstat (limited to 'library/std/src')
| -rw-r--r-- | library/std/src/os/windows/fs.rs | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/library/std/src/os/windows/fs.rs b/library/std/src/os/windows/fs.rs index f15baff59db..a091f06dd53 100644 --- a/library/std/src/os/windows/fs.rs +++ b/library/std/src/os/windows/fs.rs @@ -7,6 +7,7 @@ use crate::fs::{self, Metadata, OpenOptions}; use crate::io; use crate::path::Path; +use crate::sealed::Sealed; use crate::sys; use crate::sys_common::{AsInner, AsInnerMut}; @@ -502,17 +503,20 @@ impl MetadataExt for Metadata { /// Windows-specific extensions to [`fs::FileType`]. /// /// On Windows, a symbolic link knows whether it is a file or directory. -#[unstable(feature = "windows_file_type_ext", issue = "none")] -pub trait FileTypeExt { +#[stable(feature = "windows_file_type_ext", since = "1.64.0")] +pub trait FileTypeExt: Sealed { /// Returns `true` if this file type is a symbolic link that is also a directory. - #[unstable(feature = "windows_file_type_ext", issue = "none")] + #[stable(feature = "windows_file_type_ext", since = "1.64.0")] fn is_symlink_dir(&self) -> bool; /// Returns `true` if this file type is a symbolic link that is also a file. - #[unstable(feature = "windows_file_type_ext", issue = "none")] + #[stable(feature = "windows_file_type_ext", since = "1.64.0")] fn is_symlink_file(&self) -> bool; } -#[unstable(feature = "windows_file_type_ext", issue = "none")] +#[stable(feature = "windows_file_type_ext", since = "1.64.0")] +impl Sealed for fs::FileType {} + +#[stable(feature = "windows_file_type_ext", since = "1.64.0")] impl FileTypeExt for fs::FileType { fn is_symlink_dir(&self) -> bool { self.as_inner().is_symlink_dir() |
