Skip to content

fallback for construct_generic_bound_failure #117570

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
Merged
merged 1 commit into from
Nov 4, 2023
Merged

fallback for construct_generic_bound_failure #117570

merged 1 commit into from
Nov 4, 2023

Conversation

bvanjoi
Copy link
Contributor

@bvanjoi bvanjoi commented Nov 4, 2023

Fixes #117547

This case regressed at #115882.

In this context, generic_param_scope is produced by RPITVisitor and not included by hir_owner. Therefore, I've added a fallback to address this.

@rustbot
Copy link
Collaborator

rustbot commented Nov 4, 2023

r? @cjgillot

(rustbot has picked a reviewer for you, use r? to override)

@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 Nov 4, 2023
cjgillot
cjgillot reviewed Nov 4, 2023
View reviewed changes
Copy link
Contributor

@cjgillot cjgillot 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 one nit

tests/ui/impl-trait/issue-117547.rs Outdated
Copy link
Contributor

Choose a reason for hiding this comment

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

Could you give a more descriptive name to the test?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I've moved this case to impl-trait/in-trait, and renamed it as async-and-ret-ref.

@cjgillot cjgillot 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 Nov 4, 2023
@bvanjoi
Copy link
Contributor Author

bvanjoi commented Nov 4, 2023

ci is green.

@rustbot ready

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Nov 4, 2023
@cjgillot
Copy link
Contributor

cjgillot commented Nov 4, 2023

@bors r+ rollup

@bors
Copy link
Collaborator

bors commented Nov 4, 2023

📌 Commit a4768fe has been approved by cjgillot

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 Nov 4, 2023
@matthiaskrgr matthiaskrgr mentioned this pull request Nov 4, 2023
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Nov 4, 2023
@bors
Auto merge of rust-lang#117590 - matthiaskrgr:rollup-9cqh1q8, r=matth…
4b85902 
…iaskrgr

Rollup of 6 pull requests

Successful merges:

 - rust-lang#110340 (Deref docs: expand and remove "smart pointer" qualifier)
 - rust-lang#116894 (Guarantee that `char` has the same size and alignment as `u32`)
 - rust-lang#117534 (clarify that the str invariant is a safety, not validity, invariant)
 - rust-lang#117562 (triagebot no-merges: exclude different case)
 - rust-lang#117570 (fallback for `construct_generic_bound_failure`)
 - rust-lang#117583 (Remove `'tcx` lifetime on `PlaceholderConst`)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit a47c137 into rust-lang:master Nov 4, 2023
@rustbot rustbot added this to the 1.75.0 milestone Nov 4, 2023
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Nov 4, 2023
@rust-timer
Unrolled build for rust-lang#117570
541d676 
Rollup merge of rust-lang#117570 - bvanjoi:fix-117547, r=cjgillot

fallback for `construct_generic_bound_failure`

Fixes rust-lang#117547

This case regressed at rust-lang#115882.

In this context, `generic_param_scope` is produced by `RPITVisitor` and not included by `hir_owner`. Therefore, I've added a fallback to address this.
@github-actions github-actions bot mentioned this pull request Nov 6, 2023
Merged
bors-ferrocene bot added a commit to ferrocene/ferrocene that referenced this pull request Nov 6, 2023
@bors-ferrocene @BenWiederhake
@SabrinaJewson @J-ZhengLi @koka831 @bjorn3 @joshlf @lengyijun @Zalathar @oli-obk @flip1995 @y21 @bors @bvanjoi
Merge #84
a01e81f 
84: Automated pull from upstream `master` r=Dajamante a=github-actions[bot]


This PR pulls the following changes from the upstream repository:

* rust-lang/rust#117585
* rust-lang/rust#117576
* rust-lang/rust#96979
* rust-lang/rust#117191
* rust-lang/rust#117179
* rust-lang/rust#117574
* rust-lang/rust#117537
* rust-lang/rust#117608
  * rust-lang/rust#117596
  * rust-lang/rust#117588
  * rust-lang/rust#117524
  * rust-lang/rust#116017
* rust-lang/rust#117504
* rust-lang/rust#117469
* rust-lang/rust#116218
* rust-lang/rust#117589
* rust-lang/rust#117581
* rust-lang/rust#117503
* rust-lang/rust#117590
  * rust-lang/rust#117583
  * rust-lang/rust#117570
  * rust-lang/rust#117562
  * rust-lang/rust#117534
  * rust-lang/rust#116894
  * rust-lang/rust#110340
* rust-lang/rust#113343
* rust-lang/rust#117579
* rust-lang/rust#117094
* rust-lang/rust#117566
* rust-lang/rust#117564
  * rust-lang/rust#117554
  * rust-lang/rust#117550
  * rust-lang/rust#117343
* rust-lang/rust#115274
* rust-lang/rust#117540
* rust-lang/rust#116412
* rust-lang/rust#115333
* rust-lang/rust#117507
* rust-lang/rust#117538
  * rust-lang/rust#117533
  * rust-lang/rust#117523
  * rust-lang/rust#117520
  * rust-lang/rust#117505
  * rust-lang/rust#117434
* rust-lang/rust#117535
* rust-lang/rust#117510
* rust-lang/rust#116439
* rust-lang/rust#117508



Co-authored-by: Ben Wiederhake <BenWiederhake.GitHub@gmx.de>
Co-authored-by: SabrinaJewson <sejewson@gmail.com>
Co-authored-by: J-ZhengLi <lizheng135@huawei.com>
Co-authored-by: koka <koka.code@gmail.com>
Co-authored-by: bjorn3 <17426603+bjorn3@users.noreply.github.com>
Co-authored-by: Joshua Liebow-Feeser <joshlf@users.noreply.github.com>
Co-authored-by: lengyijun <sjtu5140809011@gmail.com>
Co-authored-by: Zalathar <Zalathar@users.noreply.github.com>
Co-authored-by: Oli Scherer <git-spam-no-reply9815368754983@oli-obk.de>
Co-authored-by: Philipp Krones <hello@philkrones.com>
Co-authored-by: y21 <30553356+y21@users.noreply.github.com>
Co-authored-by: bors <bors@rust-lang.org>
Co-authored-by: bohan <bohan-zhang@foxmail.com>
# for free to join this conversation on GitHub. Already have an account? # to comment
Reviewers

@cjgillot cjgillot cjgillot left review comments

Assignees

@cjgillot cjgillot

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

Successfully merging this pull request may close these issues.

ICE: None in error reporting
4 participants
@bvanjoi @rustbot @cjgillot @bors