Skip to content

Stabilize "file_lock" feature #142125

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

Jump to bottom
Merged
merged 1 commit into from
Jun 16, 2025
Merged

Stabilize "file_lock" feature #142125

merged 1 commit into from
Jun 16, 2025
+11 −17

Conversation

cberner
Copy link
Contributor

@cberner cberner commented Jun 6, 2025

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-libs Relevant to the library team, which will review and decide on the PR/issue. labels Jun 6, 2025
@ChrisDenton
Copy link
Member

The ten-day FCP is complete and, assuming @joshtriplett doesn't have any objections, I'll approve this

@bors r+

@bors
Copy link
Collaborator

bors commented Jun 13, 2025

📌 Commit 077e0cf has been approved by ChrisDenton

It is now in the queue for this repository.

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Jun 13, 2025
jhpratt added a commit to jhpratt/rust that referenced this pull request Jun 14, 2025
@jhpratt
Rollup merge of rust-lang#142125 - cberner:file_lock_stable, r=ChrisD…
ecb69b0 
…enton

Stabilize "file_lock" feature

Closes rust-lang#130994

r? `@joshtriplett`
@jhpratt jhpratt mentioned this pull request Jun 14, 2025
Closed
@matthiaskrgr
Copy link
Member

@bors r-
#142490 (comment)

@bors bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Jun 14, 2025
@ChrisDenton
Copy link
Member

@cberner you'll need to remove #![feature(file_lock)] from src/tools/miri. You might need to rebase first as that seems newly added.

@cberner cberner force-pushed the file_lock_stable branch from 077e0cf to 940b7d2 Compare June 15, 2025 02:37
@rustbot
Copy link
Collaborator

rustbot commented Jun 15, 2025

The Miri subtree was changed

cc @rust-lang/miri

@cberner cberner mentioned this pull request Jun 13, 2025
Closed
6 tasks
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@cberner cberner force-pushed the file_lock_stable branch from 940b7d2 to 03afa72 Compare June 15, 2025 04:19
@cberner cberner force-pushed the file_lock_stable branch from 03afa72 to 3871203 Compare June 15, 2025 13:44
@cberner
Copy link
Contributor Author

cberner commented Jun 15, 2025

If I remove the #![feature(file_lock)] in miri/lib.rs, a different step fails because it is compiling miri with an older 2025-05-25 bootstrap compiler. So I changed that to cfg_attr(bootstrap, ...) just like the usage of feature(cfg_match)

Looks like CI is passing now

@cberner
Copy link
Contributor Author

cberner commented Jun 15, 2025

r? @ChrisDenton

@rustbot rustbot assigned ChrisDenton and unassigned joshtriplett Jun 15, 2025
@cberner
Copy link
Contributor Author

cberner commented Jun 15, 2025

@rustbot ready

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Jun 15, 2025
@ChrisDenton
Copy link
Member

Great, thanks for fixing that! Let's try again:

@bors r+

@bors
Copy link
Collaborator

bors commented Jun 15, 2025

📌 Commit 3871203 has been approved by ChrisDenton

It is now in the queue for this repository.

@bors bors removed the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jun 15, 2025
@bors bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Jun 15, 2025
tgross35 added a commit to tgross35/rust that referenced this pull request Jun 16, 2025
@tgross35
Rollup merge of rust-lang#142125 - cberner:file_lock_stable, r=ChrisD…
867f71b 
…enton

Stabilize "file_lock" feature

Closes rust-lang#130994

r? `@joshtriplett`
@tgross35 tgross35 mentioned this pull request Jun 16, 2025
Closed
bors added a commit that referenced this pull request Jun 16, 2025
@bors
Auto merge of #142558 - tgross35:rollup-ld8nn4w, r=tgross35
befb020 
Rollup of 7 pull requests

Successful merges:

 - #138237 (Get rid of `EscapeDebugInner`.)
 - #140809 (Reduce special casing for the panic runtime)
 - #141990 (Implement send_signal for unix child processes)
 - #142082 (Refactor `rustc_attr_data_structures` documentation)
 - #142125 (Stabilize "file_lock" feature)
 - #142528 (clarify `rustc_do_not_const_check` comment)
 - #142530 (use `if let` guards where possible)

r? `@ghost`
`@rustbot` modify labels: rollup
tgross35 added a commit to tgross35/rust that referenced this pull request Jun 16, 2025
@tgross35
Rollup merge of rust-lang#142125 - cberner:file_lock_stable, r=ChrisD…
f89b2fa 
…enton

Stabilize "file_lock" feature

Closes rust-lang#130994

r? ``@joshtriplett``
@tgross35 tgross35 mentioned this pull request Jun 16, 2025
Closed
bors added a commit that referenced this pull request Jun 16, 2025
@bors
Auto merge of #142564 - tgross35:rollup-v12umar, r=tgross35
10a3c71 
Rollup of 8 pull requests

Successful merges:

 - #140809 (Reduce special casing for the panic runtime)
 - #142082 (Refactor `rustc_attr_data_structures` documentation)
 - #142125 (Stabilize "file_lock" feature)
 - #142373 (Fix Debug for Location)
 - #142414 (ignore `run-make` tests that need `std` on targets without `std`)
 - #142416 (Assorted bootstrap cleanups (step 2))
 - #142431 (Add initial version of snapshot tests to bootstrap)
 - #142528 (clarify `rustc_do_not_const_check` comment)

r? `@ghost`
`@rustbot` modify labels: rollup
@Kobzol Kobzol mentioned this pull request Jun 16, 2025
Merged
bors added a commit that referenced this pull request Jun 16, 2025
@bors
Auto merge of #142574 - Kobzol:rollup-ldj386u, r=Kobzol
3bc767e 
Rollup of 12 pull requests

Successful merges:

 - #141639 (Expose discriminant values in stable_mir)
 - #142082 (Refactor `rustc_attr_data_structures` documentation)
 - #142125 (Stabilize "file_lock" feature)
 - #142236 (Add documentation for `PathBuf`'s `FromIterator` and `Extend` impls)
 - #142373 (Fix Debug for Location)
 - #142416 (Assorted bootstrap cleanups (step 2))
 - #142431 (Add initial version of snapshot tests to bootstrap)
 - #142450 (Add documentation on top of `rustc_middle/src/query/mod.rs`)
 - #142528 (clarify `rustc_do_not_const_check` comment)
 - #142530 (use `if let` guards where possible)
 - #142561 (Remove an `njn:` comment accidentaly left behind.)
 - #142566 (Fix `-nopt` CI jobs)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit c4e1174 into rust-lang:master Jun 16, 2025
10 checks passed
@rustbot rustbot added this to the 1.89.0 milestone Jun 16, 2025
rust-timer added a commit that referenced this pull request Jun 16, 2025
@rust-timer
Unrolled build for #142125
3b755d2 
Rollup merge of #142125 - cberner:file_lock_stable, r=ChrisDenton

Stabilize "file_lock" feature

Closes #130994

r? ```@joshtriplett```
compiler-errors pushed a commit to compiler-errors/rust that referenced this pull request Jun 16, 2025
@bors @compiler-errors
Auto merge of rust-lang#142574 - Kobzol:rollup-ldj386u, r=Kobzol
ccd6824 
Rollup of 12 pull requests

Successful merges:

 - rust-lang#141639 (Expose discriminant values in stable_mir)
 - rust-lang#142082 (Refactor `rustc_attr_data_structures` documentation)
 - rust-lang#142125 (Stabilize "file_lock" feature)
 - rust-lang#142236 (Add documentation for `PathBuf`'s `FromIterator` and `Extend` impls)
 - rust-lang#142373 (Fix Debug for Location)
 - rust-lang#142416 (Assorted bootstrap cleanups (step 2))
 - rust-lang#142431 (Add initial version of snapshot tests to bootstrap)
 - rust-lang#142450 (Add documentation on top of `rustc_middle/src/query/mod.rs`)
 - rust-lang#142528 (clarify `rustc_do_not_const_check` comment)
 - rust-lang#142530 (use `if let` guards where possible)
 - rust-lang#142561 (Remove an `njn:` comment accidentaly left behind.)
 - rust-lang#142566 (Fix `-nopt` CI jobs)

r? `@ghost`
`@rustbot` modify labels: rollup
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@ChrisDenton ChrisDenton

Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-libs Relevant to the library team, which will review and decide on the PR/issue.
Projects
None yet
Milestone
1.89.0
Development

Successfully merging this pull request may close these issues.

Tracking Issue for File lock API
7 participants
@cberner @ChrisDenton @bors @matthiaskrgr @rustbot @rust-log-analyzer @joshtriplett