bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Rollup merge of #100249 - Meziu:master, r=joshtriplett

Browse source 
Fix HorizonOS regression in FileTimes

The changes in #98246 caused a regression for multiple Newlib-based systems. This is just a fix including HorizonOS to the list of  targets which require a workaround.

``@AzureMarker`` ``@ian-h-chamberlain``
r? ``@nagisa``
This commit is contained in:
Matthias Krüger 2022-08-14 20:16:00 +02:00 • committed by GitHub
commit b8b3ead67a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

10
library/std/src/sys/unix/fs.rs
View file

@ -544,11 +544,11 @@ impl Default for FileTimes {
fn default() -> Self { fn default() -> Self {
// Redox doesn't appear to support `UTIME_OMIT`, so we stub it out here, and always return // Redox doesn't appear to support `UTIME_OMIT`, so we stub it out here, and always return
// an error in `set_times`. // an error in `set_times`.
// ESP-IDF does not support `futimens` at all and the behavior for that OS is therefore // ESP-IDF and HorizonOS do not support `futimens` at all and the behavior for those OS is therefore
// the same as for Redox. // the same as for Redox.
#[cfg(any(target_os = "redox", target_os = "espidf"))] #[cfg(any(target_os = "redox", target_os = "espidf", target_os = "horizon"))]
let omit = libc::timespec { tv_sec: 0, tv_nsec: 0 }; let omit = libc::timespec { tv_sec: 0, tv_nsec: 0 };
#[cfg(not(any(target_os = "redox", target_os = "espidf")))] #[cfg(not(any(target_os = "redox", target_os = "espidf", target_os = "horizon")))]
let omit = libc::timespec { tv_sec: 0, tv_nsec: libc::UTIME_OMIT as _ }; let omit = libc::timespec { tv_sec: 0, tv_nsec: libc::UTIME_OMIT as _ };
Self([omit; 2]) Self([omit; 2])
} }
@ -1083,9 +1083,9 @@ impl File {
pub fn set_times(&self, times: FileTimes) -> io::Result<()> { pub fn set_times(&self, times: FileTimes) -> io::Result<()> {
cfg_if::cfg_if! { cfg_if::cfg_if! {
if #[cfg(any(target_os = "redox", target_os = "espidf"))] { if #[cfg(any(target_os = "redox", target_os = "espidf", target_os = "horizon"))] {
// Redox doesn't appear to support `UTIME_OMIT`. // Redox doesn't appear to support `UTIME_OMIT`.
// ESP-IDF does not support `futimens` at all and the behavior for that OS is therefore // ESP-IDF and HorizonOS do not support `futimens` at all and the behavior for those OS is therefore
// the same as for Redox. // the same as for Redox.
drop(times); drop(times);
Err(io::const_io_error!( Err(io::const_io_error!(