Increase the format version of rustdoc-json-types#93132
Merged
bors merged 1 commit intorust-lang:masterfrom Jan 22, 2022
Merged
Increase the format version of rustdoc-json-types#93132bors merged 1 commit intorust-lang:masterfrom
bors merged 1 commit intorust-lang:masterfrom
Conversation
rustbot
added
the
T-rustdoc
Member
Author
Contributor
|
As mentioned in the linked PR, some changes may be reverted. I'd like to wait on merging this till that settles. But I appreciate the update, and like moving the constant to the top. |
Contributor
|
I'm unclear in why and what should be reverted. Can you elaborate? |
Contributor
|
To add a little more to Oli's question, there were definitely a lot of changes in the PR where I made a mistake in adding them, but they have been fixed by later PRs without being reverted. Is there any further reason to revert changes, esp. w/ regards to rustdoc-json, and if so what parts |
Contributor
|
Nope, it looks good now. I was personally somewhat confused what the plan was on the other PR, given what you just said, this looks good to merge. |
Contributor
|
@bors r+ rollup |
Collaborator
|
📌 Commit 1521b53 has been approved by |
bors
added
the
S-waiting-on-bors
matthiaskrgr
added a commit
to matthiaskrgr/rust
that referenced
this pull request
Jan 22, 2022
…on, r=oli-obk Increase the format version of rustdoc-json-types PR rust-lang#87648 changed `rustdoc-json-types` without increasing the format version. rust-lang@e7529d6#diff-ede26372490522288745c5b3df2b6b2a1cc913dcd09b29af3a49935afe00c7e6 This PR increase the format version by +1 and move the `FORMAT_VERSION` constant to the start of the file to hopefully make it more clear that `rustdoc-json-types` is versioned.
matthiaskrgr
added a commit
to matthiaskrgr/rust
that referenced
this pull request
Jan 22, 2022
…on, r=oli-obk Increase the format version of rustdoc-json-types PR rust-lang#87648 changed `rustdoc-json-types` without increasing the format version. rust-lang@e7529d6#diff-ede26372490522288745c5b3df2b6b2a1cc913dcd09b29af3a49935afe00c7e6 This PR increase the format version by +1 and move the `FORMAT_VERSION` constant to the start of the file to hopefully make it more clear that `rustdoc-json-types` is versioned.
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Jan 22, 2022
…askrgr Rollup of 9 pull requests Successful merges: - rust-lang#85967 (add support for the l4-bender linker on the x86_64-unknown-l4re-uclibc tier 3 target) - rust-lang#92828 (Print a helpful message if unwinding aborts when it reaches a nounwind function) - rust-lang#93012 (Update pulldown-cmark version to fix markdown list issue) - rust-lang#93116 (Simplify use of `map_or`) - rust-lang#93132 (Increase the format version of rustdoc-json-types) - rust-lang#93147 (Interner cleanups) - rust-lang#93153 (Reject unsupported naked functions) - rust-lang#93170 (Add missing GUI test explanations) - rust-lang#93172 (rustdoc: remove dashed underline under main heading) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
Member
|
@rustbot modify labels: +A-rustdoc-json |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
8 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
PR #87648 changed
rustdoc-json-typeswithout increasing the format version.e7529d6#diff-ede26372490522288745c5b3df2b6b2a1cc913dcd09b29af3a49935afe00c7e6
This PR increase the format version by +1 and move the
FORMAT_VERSIONconstant to the start of the file to hopefully make it more clear thatrustdoc-json-typesis versioned.