nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2025-02-02 10:04:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix and undeprecate home_dir()

Browse Source
This commit is contained in:
Kornel 2024-11-02 11:05:01 +00:00
parent 42188c3ca8
commit 4b7f56ac9d
No known key found for this signature in database
3 changed files with 15 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
library/std/src/env.rs
View File

@ -608,20 +608,16 @@ impl Error for JoinPathsError {
/// ///
/// # Windows /// # Windows
/// ///
/// - Returns the value of the 'HOME' environment variable if it is set /// - Returns the value of the 'USERPROFILE' environment variable if it is set, and is not an empty string.
/// (including to an empty string). /// - Otherwise, [`GetUserProfileDirectory`][msdn] is used to return the path. This may change in the future.
/// - Otherwise, returns the value of the 'USERPROFILE' environment variable if it is set
/// (including to an empty string).
/// - If both do not exist, [`GetUserProfileDirectory`][msdn] is used to return the path.
/// ///
/// [msdn]: https://docs.microsoft.com/en-us/windows/win32/api/userenv/nf-userenv-getuserprofiledirectorya /// [msdn]: https://docs.microsoft.com/en-us/windows/win32/api/userenv/nf-userenv-getuserprofiledirectorya
/// ///
/// # Deprecation /// In UWP (Universal Windows Platform) targets this function is unimplemented and always returns `None`.
/// ///
/// This function is deprecated because the behavior on Windows is not correct. /// Before Rust CURRENT_RUSTC_VERSION, this function used to return the value of the 'HOME' environment variable
/// The 'HOME' environment variable is not standard on Windows, and may not produce /// on Windows, which in Cygwin or Mingw environments could return non-standard paths like `/home/you`
/// desired results; for instance, under Cygwin or Mingw it will return `/home/you` /// instead of `C:\Users\you`.
/// when it should return `C:\Users\you`.
/// ///
/// # Examples /// # Examples
/// ///

4
library/std/src/sys/pal/windows/os.rs
View File

@ -377,8 +377,8 @@ fn home_dir_crt() -> Option<PathBuf> {
} }
pub fn home_dir() -> Option<PathBuf> { pub fn home_dir() -> Option<PathBuf> {
crate::env::var_os("HOME") crate::env::var_os("USERPROFILE")
.or_else(|| crate::env::var_os("USERPROFILE")) .filter(|s| !s.is_empty())
.map(PathBuf::from) .map(PathBuf::from)
.or_else(home_dir_crt) .or_else(home_dir_crt)
} }

14
library/std/tests/env.rs
View File

@ -122,19 +122,19 @@ fn env_home_dir() {
assert!(home_dir().is_some()); assert!(home_dir().is_some());
set_var("HOME", "/home/MountainView"); set_var("HOME", "/home/PaloAlto");
assert_eq!(home_dir(), Some(PathBuf::from("/home/MountainView"))); assert_ne!(home_dir(), Some(PathBuf::from("/home/PaloAlto")), "HOME must not be used");
remove_var("HOME");
set_var("USERPROFILE", "/home/MountainView"); set_var("USERPROFILE", "/home/MountainView");
assert_eq!(home_dir(), Some(PathBuf::from("/home/MountainView"))); assert_eq!(home_dir(), Some(PathBuf::from("/home/MountainView")));
set_var("HOME", "/home/MountainView"); remove_var("HOME");
set_var("USERPROFILE", "/home/PaloAlto");
assert_eq!(home_dir(), Some(PathBuf::from("/home/MountainView"))); assert_eq!(home_dir(), Some(PathBuf::from("/home/MountainView")));
remove_var("HOME"); set_var("USERPROFILE", "");
assert_ne!(home_dir(), Some(PathBuf::from("")), "Empty USERPROFILE must be ignored");
remove_var("USERPROFILE"); remove_var("USERPROFILE");
if let Some(oldhome) = oldhome { set_var("HOME", oldhome); } if let Some(oldhome) = oldhome { set_var("HOME", oldhome); }