Skip to content

resolve: Simplify some diagnostic code to avoid an ICE - #95350

Merged
bors merged 1 commit into
rust-lang:masterfrom
petrochenkov:qpathregr
Mar 28, 2022
Merged

resolve: Simplify some diagnostic code to avoid an ICE#95350
bors merged 1 commit into
rust-lang:masterfrom
petrochenkov:qpathregr

Conversation

@petrochenkov

@petrochenkovpetrochenkov commented Mar 26, 2022

Copy link
Copy Markdown
Contributor

No need to resolve those paths, they are already resolved, we just need to take the results from partial_res_map.

Fixes#95327

@rustbotrustbot added the T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. label Mar 26, 2022
@rust-highfive

rust-highfive commented Mar 26, 2022

Copy link
Copy Markdown
Contributor

r? @cjgillot

(rust-highfive has picked a reviewer for you, use r? to override)

@rust-highfiverust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Mar 26, 2022
@petrochenkovpetrochenkov mentioned this pull request Mar 26, 2022
Closed
@cjgillot

cjgillot commented Mar 28, 2022

Copy link
Copy Markdown
Contributor

If I understand correctly:

  • the res map should have been filled by the LateResolutionVisitor, so attempting to resolve the path a second time can only mess things up.
  • the res map is correctly filled because resolving the bounded Ty's path is the first thing that the LateResolutionVisitor does when visiting a WherePredicate, so it cannot err before having visited this path.

Looks good to me.
@bors r+

@bors

bors commented Mar 28, 2022

Copy link
Copy Markdown
Collaborator

📌 Commit a7d7a26 has been approved by cjgillot

@borsbors 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 28, 2022
@Dylan-DPCDylan-DPC mentioned this pull request Mar 28, 2022
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Mar 28, 2022
@bors
Auto merge ofrust-lang#95403- Dylan-DPC:rollup-9on30mg, r=Dylan-DPC
600ec28
Rollup of 6 pull requests
Successful merges:
- rust-lang#95301 (Remove `Nonterminal::NtTT`.)
- rust-lang#95314 (Tell users that `||` operators are not currently supported in let chain expressions)
- rust-lang#95350 (resolve: Simplify some diagnostic code to avoid an ICE)
- rust-lang#95370 ([bootstrap] Don't print `Suite not skipped` unless `--verbose` is set)
- rust-lang#95390 (Ignore doc comments in a declarative macro matcher.)
- rust-lang#95401 (Remove duplicated and unused test files)
Failed merges:
r? `@ghost`
`@rustbot` modify labels: rollup
@bors
bors merged commit 4dd9567 into rust-lang:masterMar 28, 2022
@rustbotrustbot added this to the 1.61.0 milestone Mar 28, 2022
@petrochenkov
petrochenkov deleted the qpathregr branch February 22, 2025 18:40
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

@cjgillotcjgillot

Labels

S-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.T-compilerRelevant to the compiler team, which will review and decide on the PR/issue.

Projects

None yet

Milestone

1.61.0

Development

Successfully merging this pull request may close these issues.

ice: "indeterminate path result in resolve_qpath"

5 participants

@petrochenkov@rust-highfive@cjgillot@bors@rustbot