Skip to content

Add a comment to FORMAT_VERSION. #142601

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 17, 2025
Merged

Add a comment to FORMAT_VERSION. #142601

merged 1 commit into from
Jun 17, 2025
+8 −0

Conversation

nnethercote
Copy link
Contributor

@nnethercote nnethercote commented Jun 16, 2025 •
edited by rustbot
Loading

This minimizes the chance of two PRs changing it from N to N+1.

Fixes #94591.

r? @aDotInTheVoid

@rustbot rustbot added A-rustdoc-json Area: Rustdoc JSON backend S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. labels Jun 16, 2025
@rustbot
Copy link
Collaborator

rustbot commented Jun 16, 2025

rustdoc-json-types is a public (although nightly-only) API. If possible, consider changing src/librustdoc/json/conversions.rs; otherwise, make sure you bump the FORMAT_VERSION constant.

cc @CraftSpider, @aDotInTheVoid, @Enselic, @obi1kenobi

@rustbot

This comment has been minimized.

Sign in to view
@nnethercote nnethercote mentioned this pull request Jun 16, 2025
Closed
@aDotInTheVoid
Copy link
Member

Yeah, I'm not sure why we didn't do this earlier.

r=me with the triagebot warning fixed

@bors rollup=always

This was referenced Jun 16, 2025
Open
Merged
@nnethercote
Add a comment to FORMAT_VERSION.
fb75e09 
This minimizes the chance of two PRs changing it from N to N+1.
@nnethercote nnethercote force-pushed the format_version-comment branch from f3f3703 to fb75e09 Compare June 17, 2025 01:27
@nnethercote
Copy link
Contributor Author

@bors r=aDotInTheVoid

@bors
Copy link
Collaborator

bors commented Jun 17, 2025

📌 Commit fb75e09 has been approved by aDotInTheVoid

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 17, 2025
@nnethercote
Copy link
Contributor Author

The triagebot warning is silly because the suggested solution doesn't actually fix the problem, but I removed it from the commit nonetheless just to get this moving.

@workingjubilee workingjubilee mentioned this pull request Jun 17, 2025
Merged
rust-bors bot added a commit that referenced this pull request Jun 17, 2025
@rust-bors
Auto merge of #142613 - workingjubilee:rollup-yuod2hg, r=<try>
69b2373 
Rollup of 13 pull requests

Successful merges:

 - #138538 (Make performance description of String::{insert,insert_str,remove} more precise)
 - #141946 (std: refactor explanation of `NonNull`)
 - #142216 (Miscellaneous RefCell cleanups)
 - #142542 (Manually invalidate caches in SimplifyCfg.)
 - #142563 (Refine run-make test ignores due to unpredictable `i686-pc-windows-gnu` unwind mechanism)
 - #142570 (Reject union default field values)
 - #142584 (Handle same-crate macro for borrowck semicolon suggestion)
 - #142585 (Update books)
 - #142586 (Fold unnecessary `visit_struct_field_def` in AstValidator)
 - #142587 (Make sure to propagate result from `visit_expr_fields`)
 - #142595 (Revert overeager warning for misuse of `--print native-static-libs`)
 - #142598 (Set elf e_flags on ppc64 targets according to abi)
 - #142601 (Add a comment to `FORMAT_VERSION`.)

r? `@ghost`
`@rustbot` modify labels: rollup
<!-- homu-ignore:start -->
[Create a similar rollup](https://bors.rust-lang.org/queue/rust?prs=138538,141946,142216,142542,142563,142570,142584,142585,142586,142587,142595,142598,142601)
<!-- homu-ignore:end -->
try-job: dist-apple-various
workingjubilee added a commit to workingjubilee/rustc that referenced this pull request Jun 17, 2025
@workingjubilee
Rollup merge of rust-lang#142601 - nnethercote:format_version-comment…
4e1718e 
…, r=aDotInTheVoid

Add a comment to `FORMAT_VERSION`.

This minimizes the chance of two PRs changing it from N to N+1.

Fixes rust-lang#94591.

r? ``@aDotInTheVoid``
@workingjubilee workingjubilee mentioned this pull request Jun 17, 2025
Closed
workingjubilee added a commit to workingjubilee/rustc that referenced this pull request Jun 17, 2025
@workingjubilee
Rollup merge of rust-lang#142601 - nnethercote:format_version-comment…
669d06d 
…, r=aDotInTheVoid

Add a comment to `FORMAT_VERSION`.

This minimizes the chance of two PRs changing it from N to N+1.

Fixes rust-lang#94591.

r? ```@aDotInTheVoid```
@workingjubilee workingjubilee mentioned this pull request Jun 17, 2025
Closed
bors added a commit that referenced this pull request Jun 17, 2025
@bors
Auto merge of #142616 - workingjubilee:rollup-0t8naf1, r=workingjubilee
2531756 
Rollup of 7 pull requests

Successful merges:

 - #141061 (Change __rust_no_alloc_shim_is_unstable to be a function)
 - #142585 (Update books)
 - #142586 (Fold unnecessary `visit_struct_field_def` in AstValidator)
 - #142587 (Make sure to propagate result from `visit_expr_fields`)
 - #142595 (Revert overeager warning for misuse of `--print native-static-libs`)
 - #142598 (Set elf e_flags on ppc64 targets according to abi)
 - #142601 (Add a comment to `FORMAT_VERSION`.)

r? `@ghost`
`@rustbot` modify labels: rollup
rust-bors bot added a commit that referenced this pull request Jun 17, 2025
@rust-bors
Auto merge of #142616 - workingjubilee:rollup-0t8naf1, r=<try>
5367df5 
Rollup of 7 pull requests

Successful merges:

 - #141061 (Change __rust_no_alloc_shim_is_unstable to be a function)
 - #142585 (Update books)
 - #142586 (Fold unnecessary `visit_struct_field_def` in AstValidator)
 - #142587 (Make sure to propagate result from `visit_expr_fields`)
 - #142595 (Revert overeager warning for misuse of `--print native-static-libs`)
 - #142598 (Set elf e_flags on ppc64 targets according to abi)
 - #142601 (Add a comment to `FORMAT_VERSION`.)

r? `@ghost`
`@rustbot` modify labels: rollup
<!-- homu-ignore:start -->
[Create a similar rollup](https://bors.rust-lang.org/queue/rust?prs=141061,142585,142586,142587,142595,142598,142601)
<!-- homu-ignore:end -->
try-job: x86_64-gnu-aux
bors added a commit that referenced this pull request Jun 17, 2025
@bors
Auto merge of #142613 - workingjubilee:rollup-yuod2hg, r=workingjubilee
f3db639 
Rollup of 13 pull requests

Successful merges:

 - #138538 (Make performance description of String::{insert,insert_str,remove} more precise)
 - #141946 (std: refactor explanation of `NonNull`)
 - #142216 (Miscellaneous RefCell cleanups)
 - #142542 (Manually invalidate caches in SimplifyCfg.)
 - #142563 (Refine run-make test ignores due to unpredictable `i686-pc-windows-gnu` unwind mechanism)
 - #142570 (Reject union default field values)
 - #142584 (Handle same-crate macro for borrowck semicolon suggestion)
 - #142585 (Update books)
 - #142586 (Fold unnecessary `visit_struct_field_def` in AstValidator)
 - #142587 (Make sure to propagate result from `visit_expr_fields`)
 - #142595 (Revert overeager warning for misuse of `--print native-static-libs`)
 - #142598 (Set elf e_flags on ppc64 targets according to abi)
 - #142601 (Add a comment to `FORMAT_VERSION`.)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 68ebae9 into rust-lang:master Jun 17, 2025
10 checks passed
rust-timer added a commit that referenced this pull request Jun 17, 2025
@rust-timer
Unrolled build for #142601
d5ae6cb 
Rollup merge of #142601 - nnethercote:format_version-comment, r=aDotInTheVoid

Add a comment to `FORMAT_VERSION`.

This minimizes the chance of two PRs changing it from N to N+1.

Fixes #94591.

r? `@aDotInTheVoid`
@rustbot rustbot added this to the 1.89.0 milestone Jun 17, 2025
@nnethercote nnethercote deleted the format_version-comment branch June 17, 2025 22:39
@aDotInTheVoid aDotInTheVoid mentioned this pull request Jun 17, 2025
Open
github-actions bot pushed a commit to rust-lang/miri that referenced this pull request Jun 18, 2025
@bors
Auto merge of #142613 - workingjubilee:rollup-yuod2hg, r=workingjubilee
ba32451 
Rollup of 13 pull requests

Successful merges:

 - rust-lang/rust#138538 (Make performance description of String::{insert,insert_str,remove} more precise)
 - rust-lang/rust#141946 (std: refactor explanation of `NonNull`)
 - rust-lang/rust#142216 (Miscellaneous RefCell cleanups)
 - rust-lang/rust#142542 (Manually invalidate caches in SimplifyCfg.)
 - rust-lang/rust#142563 (Refine run-make test ignores due to unpredictable `i686-pc-windows-gnu` unwind mechanism)
 - rust-lang/rust#142570 (Reject union default field values)
 - rust-lang/rust#142584 (Handle same-crate macro for borrowck semicolon suggestion)
 - rust-lang/rust#142585 (Update books)
 - rust-lang/rust#142586 (Fold unnecessary `visit_struct_field_def` in AstValidator)
 - rust-lang/rust#142587 (Make sure to propagate result from `visit_expr_fields`)
 - rust-lang/rust#142595 (Revert overeager warning for misuse of `--print native-static-libs`)
 - rust-lang/rust#142598 (Set elf e_flags on ppc64 targets according to abi)
 - rust-lang/rust#142601 (Add a comment to `FORMAT_VERSION`.)

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

@aDotInTheVoid aDotInTheVoid

Labels
A-rustdoc-json Area: Rustdoc JSON backend S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-rustdoc Relevant to the rustdoc 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.

rustdoc-json: Guard agains 2 commits making the same modification to FORMAT_VERSION
4 participants
@nnethercote @rustbot @aDotInTheVoid @bors