Skip to content

rustdoc-json: Better Header Type #94137

New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Merged
merged 2 commits into from
Feb 23, 2022
Merged

Conversation

aDotInTheVoid
Copy link
Member

  • Make ABI an enum, instead of being stringly typed
  • Replace Qualifier HashSet with 3 bools
  • Merge ABI field into header, as they always occor together

r? @CraftSpider

@rustbot modify labels: +A-rustdoc-json +T-rustdoc

- Make ABI an enum, instead of being stringly typed
- Replace Qualifier HashSet with 3 bools
- Merge ABI field into header, as they always occor together
@rust-highfive
Copy link
Contributor

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

@rustbot rustbot added T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. A-rustdoc-json Area: Rustdoc JSON backend labels Feb 18, 2022
@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Feb 18, 2022
@CraftSpider
Copy link
Contributor

I'm definitely a fan of this change
@bors r+

@bors
Copy link
Collaborator

bors commented Feb 18, 2022

📌 Commit 5f8a62d5c20bf48d58f8bb91c2f1c65edb82f40e has been approved by CraftSpider

@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 Feb 18, 2022
@CraftSpider
Copy link
Contributor

Maybe should have waited for tests to finish, but ah well, bors will fail if it does :P

@rust-log-analyzer

This comment has been minimized.

@aDotInTheVoid
Copy link
Member Author

This needs to be reapproved on the latest version

@CraftSpider
Copy link
Contributor

@bors r+

@bors
Copy link
Collaborator

bors commented Feb 23, 2022

📌 Commit fd5adef has been approved by CraftSpider

matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Feb 23, 2022
rustdoc-json: Better Header Type

- Make ABI an enum, instead of being stringly typed
- Replace Qualifier HashSet with 3 bools
- Merge ABI field into header, as they always occor together

r? `@CraftSpider`

`@rustbot` modify labels: +A-rustdoc-json +T-rustdoc
bors added a commit to rust-lang-ci/rust that referenced this pull request Feb 23, 2022
…askrgr

Rollup of 12 pull requests

Successful merges:

 - rust-lang#94128 (rustdoc: several minor fixes)
 - rust-lang#94137 (rustdoc-json: Better Header Type)
 - rust-lang#94213 (fix names in feature(...) suggestion)
 - rust-lang#94240 (Suggest calling .display() on `PathBuf` too)
 - rust-lang#94253 (Use 2021 edition in ./x.py fmt)
 - rust-lang#94259 (Bump download-ci-llvm-stamp for llvm-nm inclusion)
 - rust-lang#94260 (Fix rustdoc infinite redirection generation)
 - rust-lang#94263 (Typo fix: Close inline-code backtick)
 - rust-lang#94264 (Fix typo.)
 - rust-lang#94271 (Miri: extend comments on downcast operation)
 - rust-lang#94280 (Rename `region_should_not_be_omitted` to `should_print_region`)
 - rust-lang#94285 (Sync rustc_codegen_cranelift)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 8bb6051 into rust-lang:master Feb 23, 2022
@rustbot rustbot added this to the 1.61.0 milestone Feb 23, 2022
# for free to join this conversation on GitHub. Already have an account? # to comment
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-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants