Skip to content

<sys/timex.h>#1642

Merged
JohnTitor merged 4 commits intorust-lang:masterfrom
dfoxfranke:sys-timex
Mar 7, 2020
Merged

<sys/timex.h>#1642
JohnTitor merged 4 commits intorust-lang:masterfrom
dfoxfranke:sys-timex

Conversation

@dfoxfranke
Copy link
Contributor

@dfoxfranke dfoxfranke commented Jan 11, 2020 •
edited
Loading

Adds bindings for ntp_adjtime & co. for Linux, FreeBSD/NetBSD/Darwin, and Solaris/IllumOS.

@rust-highfive
Copy link

rust-highfive commented Jan 11, 2020

Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @gnzlbg (or someone else) soon.

If any changes to this PR are deemed necessary, please add them as extra commits. This ensures that the reviewer can see what has changed since they last reviewed the code. Due to the way GitHub handles out-of-date commits, this should also make it reasonably obvious what issues have or haven't been addressed. Large or tricky changes may require several passes of review and changes.

Please see the contribution instructions for more information.

@dfoxfranke

This comment has been minimized.

Sign in to view
@dfoxfranke dfoxfranke force-pushed the sys-timex branch 3 times, most recently from cb20da6 to 8d2f3c1 Compare January 11, 2020 22:58
@dfoxfranke

This comment has been minimized.

Sign in to view
@dfoxfranke dfoxfranke force-pushed the sys-timex branch 4 times, most recently from b0d4295 to 6a1b2ae Compare January 12, 2020 03:04
@dfoxfranke
Copy link
Contributor Author

dfoxfranke commented Jan 12, 2020

This is ready for review. Tests are failing on i686-apple-darwin because the rustc nightly is currently broken, but everything else passes.

@dfoxfranke
Copy link
Contributor Author

dfoxfranke commented Jan 22, 2020

Ping @gnzlbg. Do you know when you'll get to reviewing this?

@dfoxfranke dfoxfranke requested a review from gnzlbg January 22, 2020 17:53
@bors
Copy link
Contributor

bors commented Feb 20, 2020

☔ The latest upstream changes (presumably #1639) made this pull request unmergeable. Please resolve the merge conflicts.

@JohnTitor
Copy link
Member

JohnTitor commented Mar 1, 2020

Could you resolve conflicts and rebase? r? @JohnTitor

@rust-highfive rust-highfive assigned JohnTitor and unassigned gnzlbg Mar 1, 2020
@dfoxfranke dfoxfranke force-pushed the sys-timex branch 2 times, most recently from 67a2759 to 5246ff4 Compare March 1, 2020 17:00
@dfoxfranke dfoxfranke force-pushed the sys-timex branch 2 times, most recently from f1312ee to 04377cb Compare March 1, 2020 18:44
@dfoxfranke
Copy link
Contributor Author

dfoxfranke commented Mar 1, 2020

@JohnTitor all set.

JohnTitor
JohnTitor approved these changes Mar 7, 2020
View reviewed changes
Copy link
Member

@JohnTitor JohnTitor left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good to me, thanks!

@JohnTitor JohnTitor merged commit 00e8c79 into rust-lang:master Mar 7, 2020
This was referenced Mar 7, 2020
Closed
Merged
@dfoxfranke dfoxfranke mentioned this pull request Aug 13, 2021
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@JohnTitor JohnTitor JohnTitor approved these changes

@gnzlbg gnzlbg Awaiting requested review from gnzlbg

Assignees

@JohnTitor JohnTitor

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@dfoxfranke @rust-highfive @bors @JohnTitor @gnzlbg