Skip to content

Fix timeval conversion for 32-bit glibc time64 builds #686

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
omrzk wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix timeval conversion for 32-bit glibc time64 builds #686

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 15 additions & 0 deletions .github/workflows/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,6 +125,21 @@ jobs:
run: cargo hack check -Z build-std=std,panic_abort --feature-powerset --target ${{ matrix.target }}
- name: Check docs
run: RUSTDOCFLAGS="-D warnings --cfg docsrs" cargo doc -Z build-std=std,panic_abort --no-deps --all-features --target ${{ matrix.target }}
CheckTime64:
name: Check 64-bit time (${{ matrix.target }})
runs-on: ubuntu-latest
strategy:
matrix:
target: [i686-unknown-linux-gnu, armv7-unknown-linux-gnueabihf]
steps:
- uses: actions/checkout@v4
- uses: dtolnay/rust-toolchain@stable
with:
targets: ${{ matrix.target }}
- name: Check build with 64-bit time
env:
RUSTFLAGS: --cfg=libc_unstable_time64
run: cargo check --all-targets --all-features --target ${{ matrix.target }}
Clippy:
name: Clippy
runs-on: ubuntu-latest
Expand Down
2 changes: 1 addition & 1 deletion src/sys/unix.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1315,7 +1315,7 @@ fn into_timeval(duration: Option<Duration>) -> libc::timeval {
#[cfg_attr(target_env = "musl", allow(deprecated))]
Some(duration) => libc::timeval {
tv_sec: min(duration.as_secs(), libc::time_t::MAX as u64) as libc::time_t,
tv_usec: duration.subsec_micros() as libc::suseconds_t,
tv_usec: duration.subsec_micros() as _,
},
None => libc::timeval {
tv_sec: 0,
Expand Down
Loading