Skip to content
New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Jump to bottom

Make fns from other crates with RPITIT work for -Zlower-impl-trait-in-trait-to-assoc-ty #108923

Merged
merged 2 commits into from
Mar 14, 2023
Merged

Make fns from other crates with RPITIT work for -Zlower-impl-trait-in-trait-to-assoc-ty #108923

merged 2 commits into from
Mar 14, 2023

Conversation

spastorino
Copy link
Member

@spastorino spastorino commented Mar 8, 2023 •
edited
Loading

Only the last two commits are meaningful.

r? @compiler-errors

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels Mar 8, 2023
@compiler-errors
Copy link
Member

I would appreciate if you left a bit more explanation left in comments (or in the PR summary, which is empty) for why the various fixes that you add actually fix the problems that they do. Sometimes it's hard to work backwards to see why these changes you've made actually fix the ICEs they do.

@compiler-errors
Copy link
Member

compiler-errors commented Mar 8, 2023 •
edited
Loading

Re: Last comment asking for a better PR summary -- this is a draft, I guess, so maybe it wasn't ready yet. But I did see r? @compiler-errors so I'm going to leave comments as soon as I get a ping 🤣 -- if you want me to leave a PR alone, feel free to r? @ghost first then r? @compiler-errors when it's ready for review.

@spastorino
Copy link
Member Author

spastorino commented Mar 9, 2023 •
edited
Loading

@compiler-errors thanks for the review. I think now the changes are trivial, but basically the same as always, trying to access HIR for the def_id of the RPITIT that doesn't have HIR, so needed to avoid doing that in some cases by invoking queries and feeding other queries in other cases.

Also, I meant you to review. Marking it as a draft because it should go after these other PRs that I have opened are merged.

@bors
Copy link
Contributor

bors commented Mar 10, 2023

☔ The latest upstream changes (presumably #108977) made this pull request unmergeable. Please resolve the merge conflicts.

@spastorino spastorino marked this pull request as ready for review March 10, 2023 20:13
@bors
Copy link
Contributor

bors commented Mar 12, 2023

☔ The latest upstream changes (presumably #108700) made this pull request unmergeable. Please resolve the merge conflicts.

@spastorino
Copy link
Member Author

@compiler-errors, this one was already ready for a review :).

compiler-errors
compiler-errors approved these changes Mar 14, 2023
View reviewed changes
Copy link
Member

@compiler-errors compiler-errors left a comment

Choose a reason for hiding this comment

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

r=me with a comment please

compiler/rustc_hir/src/definitions.rs Show resolved Hide resolved
@bors
Copy link
Contributor

bors commented Mar 14, 2023

☔ The latest upstream changes (presumably #109057) made this pull request unmergeable. Please resolve the merge conflicts.

@spastorino
Copy link
Member Author

@bors r=compiler-errors

@bors
Copy link
Contributor

bors commented Mar 14, 2023

📌 Commit a4e4037 has been approved by compiler-errors

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 Mar 14, 2023
@matthiaskrgr matthiaskrgr mentioned this pull request Mar 14, 2023
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Mar 14, 2023
@bors
Auto merge of rust-lang#109130 - matthiaskrgr:rollup-dm3jza6, r=matth…
1716932 
…iaskrgr

Rollup of 9 pull requests

Successful merges:

 - rust-lang#108722 (Support for Fuchsia RISC-V target)
 - rust-lang#108880 (Remove tests/ui/impl-trait/in-trait/new-lowering-strategy in favor of using revisions on existing tests)
 - rust-lang#108909 (Fix object safety checks for new RPITITs)
 - rust-lang#108915 (Remove some direct calls to local_def_id_to_hir_id on diagnostics)
 - rust-lang#108923 (Make fns from other crates with RPITIT work for -Zlower-impl-trait-in-trait-to-assoc-ty)
 - rust-lang#109101 (Fall back to old metadata computation when type references errors)
 - rust-lang#109105 (Don't ICE for late-bound consts across `AnonConstBoundary`)
 - rust-lang#109110 (Don't codegen impossible to satisfy impls)
 - rust-lang#109116 (Emit diagnostic when calling methods on the unit type in method chains)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 21d15db into rust-lang:master Mar 14, 2023
@rustbot rustbot added this to the 1.70.0 milestone Mar 14, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@compiler-errors compiler-errors compiler-errors approved these changes

Assignees

@compiler-errors compiler-errors

Labels
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.
Projects
None yet
Milestone
1.70.0
Development

Successfully merging this pull request may close these issues.
4 participants
@spastorino @compiler-errors @bors @rustbot