Skip to content

Add futex constants#1336

Merged
bors merged 2 commits into
rust-lang:masterfrom
faern:add-futex-consts
May 16, 2019
Merged

Add futex constants#1336
bors merged 2 commits into
rust-lang:masterfrom
faern:add-futex-consts

Conversation

@faern

@faern faern commented May 12, 2019

Copy link
Copy Markdown
Contributor

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
Copy Markdown

r? @gnzlbg

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

@faern

faern commented May 13, 2019

Copy link
Copy Markdown
Contributor Author

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

gnzlbg commented May 13, 2019

Copy link
Copy Markdown
Contributor

@bors: r+

@bors

bors commented May 13, 2019

Copy link
Copy Markdown
Contributor

📌 Commit 97bf059 has been approved by gnzlbg

@bors

bors commented May 13, 2019

Copy link
Copy Markdown
Contributor

⌛ 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

bors commented May 13, 2019

Copy link
Copy Markdown
Contributor

💔 Test failed - checks-travis

@gnzlbg

gnzlbg commented May 16, 2019

Copy link
Copy Markdown
Contributor

This needs to be rebased.

@bors

bors commented May 16, 2019

Copy link
Copy Markdown
Contributor

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

@faern faern force-pushed the add-futex-consts branch from 97bf059 to 72463fc Compare May 16, 2019 18:45
@faern

faern commented May 16, 2019

Copy link
Copy Markdown
Contributor Author

Rebased. Tests pass

@gnzlbg

gnzlbg commented May 16, 2019

Copy link
Copy Markdown
Contributor

@bors: r+

@bors

bors commented May 16, 2019

Copy link
Copy Markdown
Contributor

📌 Commit 72463fc has been approved by gnzlbg

@bors

bors commented May 16, 2019

Copy link
Copy Markdown
Contributor

⌛ 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

bors commented May 16, 2019

Copy link
Copy Markdown
Contributor

☀️ 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.

5 participants