Skip to content
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

Jump to bottom

Fix glob import ICE in rustdoc JSON format #98611

Merged
merged 2 commits into from
Jun 28, 2022
Merged

Fix glob import ICE in rustdoc JSON format #98611

merged 2 commits into from
Jun 28, 2022

Conversation

GuillaumeGomez
Copy link
Member

Fixes #98003.

r? @notriddle

@GuillaumeGomez GuillaumeGomez added T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. A-rustdoc-json Area: Rustdoc JSON backend labels Jun 28, 2022
@rustbot
Copy link
Collaborator

rustbot commented Jun 28, 2022

Some changes occurred in src/librustdoc/clean/types.rs

cc @camelid

@rust-highfive
Copy link
Collaborator

Some changes occurred in clean/types.rs.

cc @camelid

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jun 28, 2022
@notriddle
Copy link
Contributor

@bors r+ rollup

@bors
Copy link
Contributor

bors commented Jun 28, 2022

📌 Commit c2221ef has been approved by notriddle

@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 28, 2022
@matthiaskrgr matthiaskrgr mentioned this pull request Jun 28, 2022
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Jun 28, 2022
@bors
Auto merge of rust-lang#98632 - matthiaskrgr:rollup-peg868d, r=matthi…
8308806 
…askrgr

Rollup of 11 pull requests

Successful merges:

 - rust-lang#98548 (rustdoc-json: Allow Typedef to be different in sanity assert)
 - rust-lang#98560 (Add regression test for rust-lang#85907)
 - rust-lang#98564 (Remove references to `./tmp` in-tree)
 - rust-lang#98602 (Add regression test for rust-lang#80074)
 - rust-lang#98606 (:arrow_up: rust-analyzer)
 - rust-lang#98609 (Fix ICE for associated constant generics)
 - rust-lang#98611 (Fix glob import ICE in rustdoc JSON format)
 - rust-lang#98617 (Remove feature `const_option` from std)
 - rust-lang#98619 (Fix mir-opt wg name)
 - rust-lang#98621 (llvm-wrapper: adapt for removal of the ASanGlobalsMetadataAnalysis LLVM API)
 - rust-lang#98623 (fix typo in comment)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 956a9f5 into rust-lang:master Jun 28, 2022
@rustbot rustbot added this to the 1.64.0 milestone Jun 28, 2022
@GuillaumeGomez GuillaumeGomez deleted the rustdoc-json-glob-ice branch June 28, 2022 21:19
# for free to join this conversation on GitHub. Already have an account? # to comment
Reviewers
No reviews
Assignees

@notriddle notriddle

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.64.0
Development

Successfully merging this pull request may close these issues.

ICE: rustdoc json: segments were empty
5 participants
@GuillaumeGomez @rustbot @rust-highfive @notriddle @bors