Skip to content
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.

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

Add futex constants #1336

Merged
merged 2 commits into from May 16, 2019
Merged

Add futex constants #1336

merged 2 commits into from May 16, 2019

Conversation

faern
Copy link
Contributor

@faern faern commented May 12, 2019

Adding some Futex constants. To be used in parking_lot. See https://github.com/faern/parking_lot/pull/1/files#r283110797

@rust-highfive
Copy link

r? @gnzlbg

(rust_highfive has picked a reviewer for you, use r? to override)

@faern
Copy link
Contributor Author

faern commented May 13, 2019

r? @alexcrichton

Also, the travis failures seem to be completely unrelated to the PR itself.

@rust-highfive rust-highfive assigned alexcrichton and unassigned gnzlbg May 13, 2019
@gnzlbg
Copy link
Contributor

gnzlbg commented May 13, 2019

@bors: r+

@bors
Copy link
Contributor

bors commented May 13, 2019

📌 Commit 97bf059 has been approved by gnzlbg

@bors
Copy link
Contributor

bors commented May 13, 2019

⌛ Testing commit 97bf059 with merge 3b32a63...

bors added a commit that referenced this pull request May 13, 2019
Add futex constants

Adding some Futex constants. To be used in `parking_lot`. See https://github.com/faern/parking_lot/pull/1/files#r283110797
@bors
Copy link
Contributor

bors commented May 13, 2019

💔 Test failed - checks-travis

@gnzlbg
Copy link
Contributor

gnzlbg commented May 16, 2019

This needs to be rebased.

@bors
Copy link
Contributor

bors commented May 16, 2019

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

@faern
Copy link
Contributor Author

faern commented May 16, 2019

Rebased. Tests pass

@gnzlbg
Copy link
Contributor

gnzlbg commented May 16, 2019

@bors: r+

@bors
Copy link
Contributor

bors commented May 16, 2019

📌 Commit 72463fc has been approved by gnzlbg

@bors
Copy link
Contributor

bors commented May 16, 2019

⌛ Testing commit 72463fc with merge 6e3c675...

bors added a commit that referenced this pull request May 16, 2019
Add futex constants

Adding some Futex constants. To be used in `parking_lot`. See https://github.com/faern/parking_lot/pull/1/files#r283110797
@bors
Copy link
Contributor

bors commented May 16, 2019

☀️ Test successful - checks-cirrus, checks-travis, status-appveyor
Approved by: gnzlbg
Pushing 6e3c675 to master...

@bors bors merged commit 72463fc into rust-lang:master May 16, 2019
@faern faern deleted the add-futex-consts branch May 10, 2020 13:50
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants