diff options
| author | bors <bors@rust-lang.org> | 2024-11-27 07:38:21 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2024-11-27 07:38:21 +0000 |
| commit | 5f8a2405a6a7ea0ff85072b3bf90f4cff1144e85 (patch) | |
| tree | 5275a6bcad0c65a14315bb6422bc78cd0e6d2c52 /library/std/src/sys/pal/unix/time.rs | |
| parent | 83965efe6ad57a2baf3b5d5678d094bf9cd936dd (diff) | |
| parent | 762a661705c52a6d99e8af37fc06aca573e35659 (diff) | |
| download | rust-5f8a2405a6a7ea0ff85072b3bf90f4cff1144e85.tar.gz rust-5f8a2405a6a7ea0ff85072b3bf90f4cff1144e85.zip | |
Auto merge of #133527 - matthiaskrgr:rollup-kyre1df, r=matthiaskrgr
Rollup of 6 pull requests Successful merges: - #132979 (use `--exact` on `--skip` to avoid unintended substring matches) - #133248 (CI: split x86_64-msvc-ext job) - #133449 (std: expose `const_io_error!` as `const_error!`) - #133453 (Commit license-metadata.json to git and check it's correct in CI) - #133457 (miri: implement `TlsFree`) - #133493 (do not constrain infer vars in `find_best_leaf_obligation`) r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'library/std/src/sys/pal/unix/time.rs')
| -rw-r--r-- | library/std/src/sys/pal/unix/time.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/library/std/src/sys/pal/unix/time.rs b/library/std/src/sys/pal/unix/time.rs index 535fe6b27d9..343864d0b3f 100644 --- a/library/std/src/sys/pal/unix/time.rs +++ b/library/std/src/sys/pal/unix/time.rs @@ -96,7 +96,7 @@ impl Timespec { if tv_nsec >= 0 && tv_nsec < NSEC_PER_SEC as i64 { Ok(unsafe { Self::new_unchecked(tv_sec, tv_nsec) }) } else { - Err(io::const_io_error!(io::ErrorKind::InvalidData, "Invalid timestamp")) + Err(io::const_error!(io::ErrorKind::InvalidData, "Invalid timestamp")) } } |