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 associated_item_def_ids for traits use an unstable option to also return associated types for RPITITs #108568

Merged
merged 5 commits into from
Mar 1, 2023
Merged

Make associated_item_def_ids for traits use an unstable option to also return associated types for RPITITs #108568

merged 5 commits into from
Mar 1, 2023

Conversation

spastorino
Copy link
Member

@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 Feb 28, 2023
@spastorino
Copy link
Member Author

spastorino commented Feb 28, 2023 •
edited
Loading

I should have opened this one as draft for a first check to see what we should place in this PR.

@spastorino spastorino force-pushed the new-rpitit-flag branch 2 times, most recently from d817564 to a71a039 Compare February 28, 2023 17:00
compiler-errors
compiler-errors reviewed Feb 28, 2023
View reviewed changes
compiler/rustc_hir_analysis/src/astconv/mod.rs Outdated Show resolved Hide resolved
compiler/rustc_metadata/src/rmeta/encoder.rs Outdated Show resolved Hide resolved
compiler/rustc_metadata/src/rmeta/encoder.rs Outdated Show resolved Hide resolved
compiler/rustc_trait_selection/src/traits/object_safety.rs Outdated Show resolved Hide resolved
compiler/rustc_ty_utils/src/assoc.rs Show resolved Hide resolved
compiler/rustc_ty_utils/src/assoc.rs Show resolved Hide resolved
tests/rustdoc-ui/z-help.stdout Outdated Show resolved Hide resolved
@spastorino spastorino force-pushed the new-rpitit-flag branch 2 times, most recently from 24d9d7a to d83c580 Compare February 28, 2023 21:32
@spastorino spastorino force-pushed the new-rpitit-flag branch 4 times, most recently from 3fda2af to bc9ff9a Compare March 1, 2023 02:05
@compiler-errors
Copy link
Member

@bors r+

@bors
Copy link
Contributor

bors commented Mar 1, 2023

📌 Commit fa26258bd9bfcf3ad198d46c6384f77a35fde66a 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 1, 2023
@bors
Copy link
Contributor

bors commented Mar 1, 2023

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

@bors bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Mar 1, 2023
@spastorino
Copy link
Member Author

@bors r=compiler-errors

@bors
Copy link
Contributor

bors commented Mar 1, 2023

📌 Commit 73e2fe0 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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Mar 1, 2023
@Dylan-DPC Dylan-DPC mentioned this pull request Mar 1, 2023
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Mar 1, 2023
@bors
Auto merge of rust-lang#108620 - Dylan-DPC:rollup-o5c4evy, r=Dylan-DPC
f77bfb7 
Rollup of 7 pull requests

Successful merges:

 - rust-lang#108143 (rustdoc: search by macro when query ends with `!`)
 - rust-lang#108394 (Make `x doc --open` work on every book)
 - rust-lang#108427 (Recover from for-else and while-else)
 - rust-lang#108462 (Fix `VecDeque::append` capacity overflow for ZSTs)
 - rust-lang#108568 (Make associated_item_def_ids for traits use an unstable option to also return associated types for RPITITs)
 - rust-lang#108604 (Add regression test for rust-lang#107280)
 - rust-lang#108605 (Add regression test for rust-lang#105821)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 9d132f7 into rust-lang:master Mar 1, 2023
@rustbot rustbot added this to the 1.69.0 milestone Mar 1, 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 left review comments

@petrochenkov petrochenkov petrochenkov left review comments

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

Successfully merging this pull request may close these issues.

None yet
5 participants
@spastorino @compiler-errors @bors @petrochenkov @rustbot