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 F_RDLCK/F_WRLCK/F_UNLCK to several platforms #1118

Merged
merged 1 commit into from
Nov 3, 2018

Conversation

smaeul
Copy link
Contributor

@smaeul smaeul commented Nov 1, 2018

These are used by the flock wrapper in rustc_data_structures. The constants were already present in x86_64-linux-gnu and BSD (since 4928bd9).

Currently the flock wrapper in rustc_data_structures does not work on several 32-bit musl targets, because they expect the LARGEFILE64 version of the F_SETLK/F_SETLKW constants. This PR is a prerequisite to converting that code to use the libc types and constants, instead of (inaccurately) duplicating them, since libc already provides architecture-specific definitions of the relevant constants.

These are used by the flock wrapper in rustc_data_structures. The
constants were already present in x86_64-linux-gnu and BSD (since
4928bd9).
@rust-highfive
Copy link

Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @alexcrichton (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.

@gnzlbg
Copy link
Contributor

gnzlbg commented Nov 1, 2018

r? @gnzlbg

@rust-highfive rust-highfive assigned gnzlbg and unassigned alexcrichton Nov 1, 2018
@gnzlbg
Copy link
Contributor

gnzlbg commented Nov 1, 2018

@bors: r+

@bors
Copy link
Contributor

bors commented Nov 1, 2018

@gnzlbg: 🔑 Insufficient privileges: Not in reviewers

@gnzlbg
Copy link
Contributor

gnzlbg commented Nov 1, 2018

The failure is spurious. I've restarted the x86_64-apple-darwin job a couple of times but it doesn't find the rust toolchain :/

@gnzlbg
Copy link
Contributor

gnzlbg commented Nov 1, 2018

@smaeul thank you for the PR. Currently x86_64-apple-darwin is missing from nightly (see The failure is caused by rust-lang/rust#55571 ). I'll r+ it as soon as the upstream issue with is solved.

--

@alexcrichton it seems that i'm still not in reviewers

@alexcrichton
Copy link
Member

@gnzlbg try again now?

@gnzlbg
Copy link
Contributor

gnzlbg commented Nov 1, 2018

@bors: r+

@bors
Copy link
Contributor

bors commented Nov 1, 2018

📌 Commit 1b130d4 has been approved by gnzlbg

bors added a commit that referenced this pull request Nov 1, 2018
Add F_RDLCK/F_WRLCK/F_UNLCK to several platforms

These are used by the flock wrapper in rustc_data_structures. The constants were already present in x86_64-linux-gnu and BSD (since 4928bd9).

Currently the `flock` wrapper in `rustc_data_structures` does not work on several 32-bit musl targets, because they expect the `LARGEFILE64` version of the `F_SETLK`/`F_SETLKW` constants. This PR is a prerequisite to converting that code to use the `libc` types and constants, instead of (inaccurately) duplicating them, since `libc` already provides architecture-specific definitions of the relevant constants.
@bors
Copy link
Contributor

bors commented Nov 1, 2018

⌛ Testing commit 1b130d4 with merge ad64b62...

@bors
Copy link
Contributor

bors commented Nov 1, 2018

💔 Test failed - status-travis

@alexcrichton
Copy link
Member

@bors: retry

@bors
Copy link
Contributor

bors commented Nov 2, 2018

⌛ Testing commit 1b130d4 with merge c1d1128...

bors added a commit that referenced this pull request Nov 2, 2018
Add F_RDLCK/F_WRLCK/F_UNLCK to several platforms

These are used by the flock wrapper in rustc_data_structures. The constants were already present in x86_64-linux-gnu and BSD (since 4928bd9).

Currently the `flock` wrapper in `rustc_data_structures` does not work on several 32-bit musl targets, because they expect the `LARGEFILE64` version of the `F_SETLK`/`F_SETLKW` constants. This PR is a prerequisite to converting that code to use the `libc` types and constants, instead of (inaccurately) duplicating them, since `libc` already provides architecture-specific definitions of the relevant constants.
@bors
Copy link
Contributor

bors commented Nov 2, 2018

💥 Test timed out

@gnzlbg
Copy link
Contributor

gnzlbg commented Nov 2, 2018

@bors: retry

@bors
Copy link
Contributor

bors commented Nov 2, 2018

⌛ Testing commit 1b130d4 with merge f381913...

bors added a commit that referenced this pull request Nov 2, 2018
Add F_RDLCK/F_WRLCK/F_UNLCK to several platforms

These are used by the flock wrapper in rustc_data_structures. The constants were already present in x86_64-linux-gnu and BSD (since 4928bd9).

Currently the `flock` wrapper in `rustc_data_structures` does not work on several 32-bit musl targets, because they expect the `LARGEFILE64` version of the `F_SETLK`/`F_SETLKW` constants. This PR is a prerequisite to converting that code to use the `libc` types and constants, instead of (inaccurately) duplicating them, since `libc` already provides architecture-specific definitions of the relevant constants.
@bors
Copy link
Contributor

bors commented Nov 2, 2018

💔 Test failed - status-travis

@alexcrichton
Copy link
Member

@bors: retry

bors added a commit that referenced this pull request Nov 2, 2018
Add F_RDLCK/F_WRLCK/F_UNLCK to several platforms

These are used by the flock wrapper in rustc_data_structures. The constants were already present in x86_64-linux-gnu and BSD (since 4928bd9).

Currently the `flock` wrapper in `rustc_data_structures` does not work on several 32-bit musl targets, because they expect the `LARGEFILE64` version of the `F_SETLK`/`F_SETLKW` constants. This PR is a prerequisite to converting that code to use the `libc` types and constants, instead of (inaccurately) duplicating them, since `libc` already provides architecture-specific definitions of the relevant constants.
@bors
Copy link
Contributor

bors commented Nov 2, 2018

⌛ Testing commit 1b130d4 with merge 63538c2...

@bors
Copy link
Contributor

bors commented Nov 2, 2018

💥 Test timed out

@gnzlbg
Copy link
Contributor

gnzlbg commented Nov 3, 2018

@bors: retry

@bors
Copy link
Contributor

bors commented Nov 3, 2018

⌛ Testing commit 1b130d4 with merge 2045e8e...

bors added a commit that referenced this pull request Nov 3, 2018
Add F_RDLCK/F_WRLCK/F_UNLCK to several platforms

These are used by the flock wrapper in rustc_data_structures. The constants were already present in x86_64-linux-gnu and BSD (since 4928bd9).

Currently the `flock` wrapper in `rustc_data_structures` does not work on several 32-bit musl targets, because they expect the `LARGEFILE64` version of the `F_SETLK`/`F_SETLKW` constants. This PR is a prerequisite to converting that code to use the `libc` types and constants, instead of (inaccurately) duplicating them, since `libc` already provides architecture-specific definitions of the relevant constants.
@bors
Copy link
Contributor

bors commented Nov 3, 2018

☀️ Test successful - status-appveyor, status-travis
Approved by: gnzlbg
Pushing 2045e8e to master...

@bors bors merged commit 1b130d4 into rust-lang:master Nov 3, 2018
@smaeul smaeul deleted the flock branch November 6, 2018 05:02
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