diff options
| author | Mads Marquart <mads@marquart.dk> | 2024-10-10 18:41:55 +0200 |
|---|---|---|
| committer | Mads Marquart <mads@marquart.dk> | 2024-10-10 18:42:24 +0200 |
| commit | 6d075dc4d7335a239f887b28a630bdc9aa08e140 (patch) | |
| tree | 169460fe8be4caba7a7ce0f531a6f41c7d14eb8a /library/std/src/sys | |
| parent | cbe428d8cb60f901cae2c99a5aff0f563b142681 (diff) | |
| download | rust-6d075dc4d7335a239f887b28a630bdc9aa08e140.tar.gz rust-6d075dc4d7335a239f887b28a630bdc9aa08e140.zip | |
Prefer `target_vendor = "apple"` on confstr
Diffstat (limited to 'library/std/src/sys')
| -rw-r--r-- | library/std/src/sys/pal/unix/os.rs | 4 | ||||
| -rw-r--r-- | library/std/src/sys/pal/unix/os/tests.rs | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/library/std/src/sys/pal/unix/os.rs b/library/std/src/sys/pal/unix/os.rs index 7db037d02eb..9750c32eed5 100644 --- a/library/std/src/sys/pal/unix/os.rs +++ b/library/std/src/sys/pal/unix/os.rs @@ -704,7 +704,7 @@ pub fn page_size() -> usize { // // [posix_confstr]: // https://pubs.opengroup.org/onlinepubs/9699919799/functions/confstr.html -#[cfg(any(target_os = "macos", target_os = "ios", target_os = "tvos", target_os = "watchos"))] +#[cfg(target_vendor = "apple")] fn confstr(key: c_int, size_hint: Option<usize>) -> io::Result<OsString> { let mut buf: Vec<u8> = Vec::new(); let mut bytes_needed_including_nul = size_hint @@ -765,7 +765,7 @@ fn darwin_temp_dir() -> PathBuf { pub fn temp_dir() -> PathBuf { crate::env::var_os("TMPDIR").map(PathBuf::from).unwrap_or_else(|| { cfg_if::cfg_if! { - if #[cfg(any(target_os = "macos", target_os = "ios", target_os = "tvos", target_os = "watchos"))] { + if #[cfg(target_vendor = "apple")] { darwin_temp_dir() } else if #[cfg(target_os = "android")] { PathBuf::from("/data/local/tmp") diff --git a/library/std/src/sys/pal/unix/os/tests.rs b/library/std/src/sys/pal/unix/os/tests.rs index ab9742fc677..a84086037ce 100644 --- a/library/std/src/sys/pal/unix/os/tests.rs +++ b/library/std/src/sys/pal/unix/os/tests.rs @@ -25,7 +25,7 @@ fn test_parse_glibc_version() { // Smoke check `confstr`, do it for several hint values, to ensure our resizing // logic is correct. #[test] -#[cfg(target_os = "macos")] +#[cfg(target_vendor = "apple")] fn test_confstr() { for key in [libc::_CS_DARWIN_USER_TEMP_DIR, libc::_CS_PATH] { let value_nohint = super::confstr(key, None).unwrap_or_else(|e| { |