Skip to content

rustdoc-json: Remove doc FIXME for Import::id and explain #99479

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 3 commits into from
Aug 10, 2022

Conversation

Enselic
Copy link
Member

@Enselic Enselic commented Jul 19, 2022

Also add some test and refactor related code a bit.

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

@rustbot rustbot added the T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. label Jul 19, 2022
@rust-highfive
Copy link
Contributor

r? @jsha

(rust-highfive has picked a reviewer for you, use r? to override)

@rustbot
Copy link
Collaborator

rustbot commented Jul 19, 2022

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

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jul 19, 2022
@rustbot rustbot added the A-rustdoc-json Area: Rustdoc JSON backend label Jul 19, 2022
Copy link
Member

@camelid camelid left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This looks good to me, thanks!

@camelid
Copy link
Member

camelid commented Aug 8, 2022

@bors r+ rollup

@bors
Copy link
Collaborator

bors commented Aug 8, 2022

📌 Commit 1b6f629 has been approved by camelid

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 Aug 8, 2022
@camelid camelid assigned camelid and unassigned jsha Aug 8, 2022
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Aug 8, 2022
…=camelid

rustdoc-json: Remove doc FIXME for Import::id and explain

Also add some test and refactor related code a bit.

`@rustbot` labels +A-rustdoc-json +T-rustdoc
bors added a commit to rust-lang-ci/rust that referenced this pull request Aug 10, 2022
…iaskrgr

Rollup of 14 pull requests

Successful merges:

 - rust-lang#98775 (rustdoc: improve scroll locking in the rustdoc mobile sidebars)
 - rust-lang#99479 (rustdoc-json: Remove doc FIXME for Import::id and explain)
 - rust-lang#100040 (Error on broken pipe but do not backtrace or ICE)
 - rust-lang#100072 (linker-plugin-lto.md: Correct the name of example c file)
 - rust-lang#100098 (Some "this expression has a field"-related fixes)
 - rust-lang#100226 (Do not manually craft a span pointing inside a multibyte character.)
 - rust-lang#100240 (Fail gracefully when const pattern is not structural match.)
 - rust-lang#100256 (Add some high-level docs to `FnCtxt` and `ItemCtxt`)
 - rust-lang#100261 (Set tainted errors bit before emitting coerce suggestions.)
 - rust-lang#100275 (also update anyhow in codegen_cranelift)
 - rust-lang#100281 (Remove more Clean trait implementations)
 - rust-lang#100314 (Mention `unit-test` in MIR opt test README)
 - rust-lang#100319 (Remove more Clean trait implementations)
 - rust-lang#100323 ([rustdoc] Don't render impl blocks with doc comment if they only contain private items by default)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 0dc39c7 into rust-lang:master Aug 10, 2022
@rustbot rustbot added this to the 1.65.0 milestone Aug 10, 2022
aDotInTheVoid added a commit to rust-lang/rustdoc-types that referenced this pull request Aug 10, 2022
aDotInTheVoid added a commit to rust-lang/rustdoc-types that referenced this pull request Aug 10, 2022
@Enselic Enselic deleted the import-can-be-without-id branch August 10, 2022 17:08
# 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-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