Skip to content

rustdoc-json: Add assoc type ICE regression test#98548

Merged
bors merged 2 commits intorust-lang:masterfrom
Enselic:allow-typedef-diff-for-rustdoc-json
Jun 28, 2022
Merged

rustdoc-json: Add assoc type ICE regression test#98548
bors merged 2 commits intorust-lang:masterfrom
Enselic:allow-typedef-diff-for-rustdoc-json

Conversation

@Enselic
Copy link
Member

@Enselic Enselic commented Jun 26, 2022

Closes #98547

This fix is a natural extension of #98053.

r? @notriddle

(Since you reviewed the other PR.)

CC @GuillaumeGomez

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

@rustbot rustbot 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 26, 2022
@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jun 26, 2022
This was referenced Jun 26, 2022
Closed
Closed
@notriddle notriddle mentioned this pull request Jun 27, 2022
Merged
@GuillaumeGomez
Copy link
Member

GuillaumeGomez commented Jun 27, 2022 •
edited
Loading

Why ignoring typedef items?

EDIT: by that I meant: why not trying to fix the underlying issue?

@Enselic
Copy link
Member Author

Enselic commented Jun 27, 2022

I'm not sure I'm following. I could ask the same about types::ItemEnum::Method(_) | types::ItemEnum::AssocConst { .. } | types::ItemEnum::AssocType { .. } | types::ItemEnum::PrimitiveType(_), couldn't I?

Anyway, I just read that #98577 fixes this ICE too. Once that PR lands, I will verify, and if the ICE indeed is fixed, I will close this PR.

@Enselic
Copy link
Member Author

Enselic commented Jun 27, 2022

Actually, it still makes sense to add this ICE regression test. So I suggest we merge that no matter what. But we can wait until the other PR lands.

@GuillaumeGomez
Copy link
Member

GuillaumeGomez commented Jun 27, 2022 •
edited
Loading

The regression test definitely makes sense. Once my PR is fixed merged, please update yours then I'll approve it.

@Enselic Enselic force-pushed the allow-typedef-diff-for-rustdoc-json branch from 85e6943 to ae4b929 Compare June 28, 2022 08:11
GuillaumeGomez
GuillaumeGomez reviewed Jun 28, 2022
View reviewed changes
@Enselic
Copy link
Member Author

Enselic commented Jun 28, 2022

r? @GuillaumeGomez

@GuillaumeGomez
Copy link
Member

GuillaumeGomez commented Jun 28, 2022

Thanks!

@bors r+ rollup

@bors
Copy link
Collaborator

bors commented Jun 28, 2022

📌 Commit 2888e76 has been approved by GuillaumeGomez

@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
@Enselic
Copy link
Member Author

Enselic commented Jun 28, 2022

Thanks for the help with fixing #98547! You had a better fix :)

@GuillaumeGomez
Copy link
Member

GuillaumeGomez commented Jun 28, 2022

Sorry I didn't see your PR sooner... I would have helped you go through.

@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
@Enselic Enselic changed the title rustdoc-json: Allow Typedef to be different in sanity assert rustdoc-json: Add assoc type ICE regression test Jun 28, 2022
@bors bors merged commit 3991e73 into rust-lang:master Jun 28, 2022
@rustbot rustbot added this to the 1.64.0 milestone Jun 28, 2022
@Enselic Enselic deleted the allow-typedef-diff-for-rustdoc-json branch June 29, 2022 08:28
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@GuillaumeGomez GuillaumeGomez GuillaumeGomez left review comments

Assignees

@GuillaumeGomez GuillaumeGomez

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.

rustdoc-json: ICE with associated type in trait

6 participants

@Enselic @GuillaumeGomez @bors @notriddle @rust-highfive @rustbot