Movatterモバイル変換

Skip to content

rust-lang/rustPublic

NotificationsYou must be signed in to change notification settings
Fork14.1k
Star108k

Commitf3ced9d

matthiaskrgr

authored

Rollup merge of#126140 - eduardosm:stabilize-fs_try_exists, r=Amanieu

Rename `std::fs::try_exists` to `std::fs::exists` and stabilize fs_try_existsFCP completed in tracking issue.Tracking issue:#83186Closes#83186Stabilized API:```rustmod fs { pub fn exists<P: AsRef<Path>>(path: P) -> io::Result<bool>;}```

2 parentsac47dba +6a04dfe commitf3ced9dCopy full SHA for f3ced9d

File tree

10 files changed

+18

-19

lines changed

library/std/src
- fs.rs
- path.rs
- sys_common
  - fs.rs
- sys/pal
  - hermit
    - fs.rs
  - solid
    - fs.rs
  - unix
    - fs.rs
    - thread.rs
  - unsupported
    - fs.rs
  - wasi
    - fs.rs
  - windows
    - fs.rs

10 files changed

+18

-19

lines changed

`‎library/std/src/fs.rs‎`

Lines changed: 5 additions & 8 deletions

Original file line number	Diff line number	Diff line change
`@@ -2742,18 +2742,15 @@ impl AsInnerMut<fs_imp::DirBuilder> for DirBuilder {`
`2742`	`2742`	`/// # Examples`
`2743`	`2743`	`///`
`2744`	`2744`	/// ```no_run
`2745`		`-/// #![feature(fs_try_exists)]`
`2746`	`2745`	`/// use std::fs;`
`2747`	`2746`	`///`
`2748`		`-/// assert!(!fs::try_exists("does_not_exist.txt").expect("Can't check existence of file does_not_exist.txt"));`
`2749`		`-/// assert!(fs::try_exists("/root/secret_file.txt").is_err());`
	`2747`	`+/// assert!(!fs::exists("does_not_exist.txt").expect("Can't check existence of file does_not_exist.txt"));`
	`2748`	`+/// assert!(fs::exists("/root/secret_file.txt").is_err());`
`2750`	`2749`	/// ```
`2751`	`2750`	`///`
`2752`	`2751`	/// [`Path::exists`]: crate::path::Path::exists
`2753`		-// FIXME: stabilization should modify documentation of `exists()` to recommend this method
`2754`		`-// instead.`
`2755`		`-#[unstable(feature ="fs_try_exists", issue ="83186")]`
	`2752`	`+#[stable(feature ="fs_try_exists", since ="CURRENT_RUSTC_VERSION")]`
`2756`	`2753`	`#[inline]`
`2757`		`-pubfntry_exists<P:AsRef<Path>>(path:P) -> io::Result<bool>{`
`2758`		`- fs_imp::try_exists(path.as_ref())`
	`2754`	`+pubfnexists<P:AsRef<Path>>(path:P) -> io::Result<bool>{`
	`2755`	`+ fs_imp::exists(path.as_ref())`
`2759`	`2756`	`}`

`‎library/std/src/path.rs‎`

Lines changed: 3 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -2907,6 +2907,8 @@ impl Path {`
`2907`	`2907`	`/// prevent time-of-check to time-of-use (TOCTOU) bugs. You should only use it in scenarios`
`2908`	`2908`	`/// where those bugs are not an issue.`
`2909`	`2909`	`///`
	`2910`	+/// This is an alias for [`std::fs::exists`](crate::fs::exists).
	`2911`	`+///`
`2910`	`2912`	`/// # Examples`
`2911`	`2913`	`///`
`2912`	`2914`	/// ```no_run
`@@ -2919,7 +2921,7 @@ impl Path {`
`2919`	`2921`	`#[stable(feature ="path_try_exists", since ="1.63.0")]`
`2920`	`2922`	`#[inline]`
`2921`	`2923`	`pubfntry_exists(&self) -> io::Result<bool>{`
`2922`		`- fs::try_exists(self)`
	`2924`	`+ fs::exists(self)`
`2923`	`2925`	`}`
`2924`	`2926`
`2925`	`2927`	/// Returns `true` if the path exists on disk and is pointing at a regular file.

`‎library/std/src/sys/pal/hermit/fs.rs‎`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ use crate::sys::time::SystemTime;`
`18`	`18`	`usecrate::sys::unsupported;`
`19`	`19`	`usecrate::sys_common::{AsInner,AsInnerMut,FromInner,IntoInner};`
`20`	`20`
`21`		`-pubusecrate::sys_common::fs::{copy,try_exists};`
	`21`	`+pubusecrate::sys_common::fs::{copy,exists};`
`22`	`22`
`23`	`23`	`#[derive(Debug)]`
`24`	`24`	`pubstructFile(FileDesc);`

`‎library/std/src/sys/pal/solid/fs.rs‎`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ use crate::{`
`12`	`12`	`sys::unsupported,`
`13`	`13`	`};`
`14`	`14`
`15`		`-pubusecrate::sys_common::fs::try_exists;`
	`15`	`+pubusecrate::sys_common::fs::exists;`
`16`	`16`
`17`	`17`	`/// A file descriptor.`
`18`	`18`	`#[derive(Clone,Copy)]`

`‎library/std/src/sys/pal/unix/fs.rs‎`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -97,7 +97,7 @@ use libc::{`
`97`	`97`	`))]`
`98`	`98`	`use libc::{dirent64, fstat64, ftruncate64, lseek64, lstat64, off64_t, open64, stat64};`
`99`	`99`
`100`		`-pubusecrate::sys_common::fs::try_exists;`
	`100`	`+pubusecrate::sys_common::fs::exists;`
`101`	`101`
`102`	`102`	`pubstructFile(FileDesc);`
`103`	`103`

`‎library/std/src/sys/pal/unix/thread.rs‎`

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -478,7 +478,7 @@ mod cgroups {`
`478`	`478`
`479`	`479`	`usecrate::borrow::Cow;`
`480`	`480`	`usecrate::ffi::OsString;`
`481`		`-usecrate::fs::{try_exists,File};`
	`481`	`+usecrate::fs::{exists,File};`
`482`	`482`	`usecrate::io::Read;`
`483`	`483`	`usecrate::io::{BufRead,BufReader};`
`484`	`484`	`usecrate::os::unix::ffi::OsStringExt;`
`@@ -556,7 +556,7 @@ mod cgroups {`
`556`	`556`	`path.push("cgroup.controllers");`
`557`	`557`
`558`	`558`	`// skip if we're not looking at cgroup2`
`559`		`-ifmatches!(try_exists(&path),Err(_) \|Ok(false)){`
	`559`	`+ifmatches!(exists(&path),Err(_) \|Ok(false)){`
`560`	`560`	`return usize::MAX;`
`561`	`561`	`};`
`562`	`562`
`@@ -613,7 +613,7 @@ mod cgroups {`
`613`	`613`	`path.push(&group_path);`
`614`	`614`
`615`	`615`	`// skip if we guessed the mount incorrectly`
`616`		`-ifmatches!(try_exists(&path),Err(_) \|Ok(false)){`
	`616`	`+ifmatches!(exists(&path),Err(_) \|Ok(false)){`
`617`	`617`	`continue;`
`618`	`618`	`}`
`619`	`619`

`‎library/std/src/sys/pal/unsupported/fs.rs‎`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -291,7 +291,7 @@ pub fn remove_dir_all(_path: &Path) -> io::Result<()> {`
`291`	`291`	`unsupported()`
`292`	`292`	`}`
`293`	`293`
`294`		`-pubfntry_exists(_path:&Path) -> io::Result<bool>{`
	`294`	`+pubfnexists(_path:&Path) -> io::Result<bool>{`
`295`	`295`	`unsupported()`
`296`	`296`	`}`
`297`	`297`

`‎library/std/src/sys/pal/wasi/fs.rs‎`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ use crate::sys::time::SystemTime;`
`17`	`17`	`usecrate::sys::unsupported;`
`18`	`18`	`usecrate::sys_common::{AsInner,FromInner,IntoInner};`
`19`	`19`
`20`		`-pubusecrate::sys_common::fs::try_exists;`
	`20`	`+pubusecrate::sys_common::fs::exists;`
`21`	`21`
`22`	`22`	`pubstructFile{`
`23`	`23`	`fd:WasiFd,`

`‎library/std/src/sys/pal/windows/fs.rs‎`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1531,7 +1531,7 @@ pub fn junction_point(original: &Path, link: &Path) -> io::Result<()> {`
`1531`	`1531`	`}`
`1532`	`1532`
`1533`	`1533`	// Try to see if a file exists but, unlike `exists`, report I/O errors.
`1534`		`-pubfntry_exists(path:&Path) -> io::Result<bool>{`
	`1534`	`+pubfnexists(path:&Path) -> io::Result<bool>{`
`1535`	`1535`	`// Open the file to ensure any symlinks are followed to their target.`
`1536`	`1536`	`letmut opts =OpenOptions::new();`
`1537`	`1537`	`// No read, write, etc access rights are needed.`

`‎library/std/src/sys_common/fs.rs‎`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ fn remove_dir_all_recursive(path: &Path) -> io::Result<()> {`
`42`	`42`	`fs::remove_dir(path)`
`43`	`43`	`}`
`44`	`44`
`45`		`-pubfntry_exists(path:&Path) -> io::Result<bool>{`
	`45`	`+pubfnexists(path:&Path) -> io::Result<bool>{`
`46`	`46`	`match fs::metadata(path){`
`47`	`47`	`Ok(_) =>Ok(true),`
`48`	`48`	`Err(error)if error.kind() == io::ErrorKind::NotFound =>Ok(false),`

0 commit comments

Comments

(0)

[8]ページ先頭

©2009-2025 Movatter.jp