rust-lang/rust
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Rollup merge of #89677 - maxwase:is-symlink-stabilization, r=joshtriplett

Browse Source 
Stabilize `is_symlink()` for `Metadata` and `Path`

I'm not fully sure about `since` version, correct me if I'm wrong

Needs update after stabilization: [cargo-test-support](8063672238/crates/cargo-test-support/src/paths.rs (L202))

Linked issue: #85748
This commit is contained in:
Matthias Krüger
2021-10-31 09:20:22 +01:00
committed by GitHub
parent e7be8a2c07 3e0360f3d4
commit 15a0cddff3
2 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
library/std/src/fs.rs
View File

@@ -1046,7 +1046,6 @@ impl Metadata {
/// ///
#[cfg_attr(unix, doc = "```no_run")] #[cfg_attr(unix, doc = "```no_run")]
#[cfg_attr(not(unix), doc = "```ignore")] #[cfg_attr(not(unix), doc = "```ignore")]
/// #![feature(is_symlink)]
/// use std::fs; /// use std::fs;
/// use std::path::Path; /// use std::path::Path;
/// use std::os::unix::fs::symlink; /// use std::os::unix::fs::symlink;
@@ -1062,7 +1061,7 @@ impl Metadata {
/// } /// }
/// ``` /// ```
#[must_use] #[must_use]
#[unstable(feature = "is_symlink", issue = "85748")] #[stable(feature = "is_symlink", since = "1.57.0")]
pub fn is_symlink(&self) -> bool { pub fn is_symlink(&self) -> bool {
self.file_type().is_symlink() self.file_type().is_symlink()
} }

11
library/std/src/path.rs
View File

@@ -2751,7 +2751,7 @@ impl Path {
fs::metadata(self).map(|m| m.is_dir()).unwrap_or(false) fs::metadata(self).map(|m| m.is_dir()).unwrap_or(false)
} }
/// Returns true if the path exists on disk and is pointing at a symbolic link. /// Returns `true` if the path exists on disk and is pointing at a symbolic link.
/// ///
/// This function will not traverse symbolic links. /// This function will not traverse symbolic links.
/// In case of a broken symbolic link this will also return true. /// In case of a broken symbolic link this will also return true.
@@ -2763,7 +2763,6 @@ impl Path {
/// ///
#[cfg_attr(unix, doc = "```no_run")] #[cfg_attr(unix, doc = "```no_run")]
#[cfg_attr(not(unix), doc = "```ignore")] #[cfg_attr(not(unix), doc = "```ignore")]
/// #![feature(is_symlink)]
/// use std::path::Path; /// use std::path::Path;
/// use std::os::unix::fs::symlink; /// use std::os::unix::fs::symlink;
/// ///
@@ -2772,8 +2771,14 @@ impl Path {
/// assert_eq!(link_path.is_symlink(), true); /// assert_eq!(link_path.is_symlink(), true);
/// assert_eq!(link_path.exists(), false); /// assert_eq!(link_path.exists(), false);
/// ``` /// ```
#[unstable(feature = "is_symlink", issue = "85748")] ///
/// # See Also
///
/// This is a convenience function that coerces errors to false. If you want to
/// check errors, call [`fs::symlink_metadata`] and handle its [`Result`]. Then call
/// [`fs::Metadata::is_symlink`] if it was [`Ok`].
#[must_use] #[must_use]
#[stable(feature = "is_symlink", since = "1.57.0")]
pub fn is_symlink(&self) -> bool { pub fn is_symlink(&self) -> bool {
fs::symlink_metadata(self).map(|m| m.is_symlink()).unwrap_or(false) fs::symlink_metadata(self).map(|m| m.is_symlink()).unwrap_or(false)
} }