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 def_key and HIR parenting consistent. #82891

Merged
merged 1 commit into from
Mar 13, 2021
Merged

Make def_key and HIR parenting consistent. #82891

merged 1 commit into from
Mar 13, 2021

Conversation

cjgillot
Copy link
Contributor

@cjgillot cjgillot commented Mar 8, 2021

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Mar 8, 2021
petrochenkov
petrochenkov reviewed Mar 10, 2021
View reviewed changes
compiler/rustc_resolve/src/lib.rs Outdated Show resolved Hide resolved
compiler/rustc_resolve/src/lib.rs Outdated Show resolved Hide resolved
compiler/rustc_resolve/src/def_collector.rs Outdated Show resolved Hide resolved
compiler/rustc_ast_lowering/src/lib.rs
@@ -1137,7 +1136,10 @@ impl<'a, 'hir> LoweringContext<'a, 'hir> {
// so desugar to
//
// fn foo(x: dyn Iterator<Item = impl Debug>)
ImplTraitContext::Universal(..) if self.is_in_dyn_type => (true, itctx),
ImplTraitContext::Universal(_, parent) if self.is_in_dyn_type => {
Copy link
Contributor

Choose a reason for hiding this comment

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

If parenting depends on flags like is_in_dyn_type unavailable in def collector, how is it possible to make it consistent?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

This specific lowering is not handled inside the def collector. The generic parameter's DefId is created line 1199, and its HIR parent is the item's generic parameter list.

compiler/rustc_resolve/src/def_collector.rs Show resolved Hide resolved
compiler/rustc_middle/src/hir/map/collector.rs Outdated Show resolved Hide resolved
@petrochenkov petrochenkov 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-review Status: Awaiting review from the assignee but also interested parties. labels Mar 10, 2021
@cjgillot cjgillot force-pushed the monoparent branch 2 times, most recently from a621208 to 3e1f478 Compare March 11, 2021 09:43
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@petrochenkov
Copy link
Contributor

r=me after squashing commits.

@cjgillot
Copy link
Contributor Author

@bors r=petrochenkov

@bors
Copy link
Contributor

bors commented Mar 11, 2021

📌 Commit b4cc003 has been approved by petrochenkov

@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 11, 2021
Dylan-DPC-zz pushed a commit to Dylan-DPC-zz/rust that referenced this pull request Mar 11, 2021
@Dylan-DPC
Rollup merge of rust-lang#82891 - cjgillot:monoparent, r=petrochenkov
7a4682a 
Make def_key and HIR parenting consistent.

r? `@petrochenkov`
@Dylan-DPC-zz Dylan-DPC-zz mentioned this pull request Mar 11, 2021
Closed
@bors
Copy link
Contributor

bors commented Mar 12, 2021

⌛ Testing commit b4cc003 with merge 7bd2b8d07c7dfc7de65738df25ef0e5b31c112be...

@rust-log-analyzer

This comment has been minimized.

Sign in to view
@bors

This comment has been minimized.

Sign in to view
@bors bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Mar 12, 2021
@petrochenkov
Copy link
Contributor

Looks like some coverage tests need to be updated.

@petrochenkov petrochenkov 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-review Status: Awaiting review from the assignee but also interested parties. labels Mar 12, 2021
@cjgillot
Copy link
Contributor Author

@bors r=petrochenkov

@bors
Copy link
Contributor

bors commented Mar 12, 2021

📌 Commit 445b4e3 has been approved by petrochenkov

@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 12, 2021
@bors
Copy link
Contributor

bors commented Mar 13, 2021

⌛ Testing commit 445b4e3 with merge 32dce35...

@bors
Copy link
Contributor

bors commented Mar 13, 2021

☀️ Test successful - checks-actions
Approved by: petrochenkov
Pushing 32dce35 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Mar 13, 2021
@bors bors merged commit 32dce35 into rust-lang:master Mar 13, 2021
@rustbot rustbot added this to the 1.52.0 milestone Mar 13, 2021
@cjgillot cjgillot deleted the monoparent branch March 13, 2021 15:12
@dwrensha dwrensha mentioned this pull request Apr 13, 2021
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@petrochenkov petrochenkov petrochenkov left review comments

Assignees

@petrochenkov petrochenkov

Labels
merged-by-bors This PR was explicitly merged by bors. S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Milestone
1.52.0
Development

Successfully merging this pull request may close these issues.
6 participants
@cjgillot @rust-log-analyzer @petrochenkov @bors @rust-highfive @rustbot