Skip to content

Rollup of 5 pull requests #96974

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

Merged
merged 15 commits into from
May 12, 2022
Merged

Rollup of 5 pull requests #96974

Changes from 1 commit
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
ab46755
Note the contacts for the nvptx64 target(s)
nagisa Apr 10, 2022
f75d02d
openbsd: convert futex timeout managment to Timespec usage
semarie May 11, 2022
3cadc11
avoid using both Some() and ? on linux/android/freebsd code
semarie May 11, 2022
42f8e1f
to_timespec could be unused by some targets
semarie May 11, 2022
84615e8
Add missing CSS file for settings page
GuillaumeGomez May 11, 2022
92482ca
Remove unused CSS settings rules
GuillaumeGomez May 11, 2022
dd6bb09
Ensure that the settings CSS is loaded on the settings page
GuillaumeGomez May 11, 2022
2c604f6
update graphviz links
nannany May 11, 2022
0fa27ef
Add tests.
cjgillot May 9, 2022
bd41874
Add mir-opt test.
cjgillot May 12, 2022
43dabbf
Rollup merge of #95896 - nagisa:nvptx-contacts, r=Mark-Simulacrum
matthiaskrgr May 12, 2022
80e1dec
Rollup merge of #96860 - semarie:openbsd-futex-time64, r=cuviper
matthiaskrgr May 12, 2022
231cd0f
Rollup merge of #96939 - GuillaumeGomez:settings-css, r=notriddle
matthiaskrgr May 12, 2022
47e4c9e
Rollup merge of #96941 - nannany:master, r=lcnr,JohnTitor
matthiaskrgr May 12, 2022
5656ea2
Rollup merge of #96968 - cjgillot:codegen-fulfill-nice, r=oli-obk
matthiaskrgr May 12, 2022
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
Prev Previous commit
Next Next commit
avoid using both Some() and ? on linux/android/freebsd code
  • Loading branch information
@semarie
semarie committed May 11, 2022
commit 3cadc11d838d5f07b2849ba148dfb83c006fb70f
2 changes: 1 addition & 1 deletion library/std/src/sys/unix/futex.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ pub fn futex_wait(futex: &AtomicU32, expected: u32, timeout: Option<Duration>) -
//
// Overflows are rounded up to an infinite timeout (None).
let timespec = timeout
.and_then(|d| Some(Timespec::now(libc::CLOCK_MONOTONIC).checked_add_duration(&d)?))
.and_then(|d| Timespec::now(libc::CLOCK_MONOTONIC).checked_add_duration(&d))
.and_then(|t| t.to_timespec());

loop {
Expand Down