Skip to content

allow ReError in CanonicalUserTypeAnnotation#109165

Merged
bors merged 1 commit intorust-lang:masterfrom
aliemjay:fix-ice-annotation
Apr 1, 2023
Merged

allow ReError in CanonicalUserTypeAnnotation#109165
bors merged 1 commit intorust-lang:masterfrom
aliemjay:fix-ice-annotation

Conversation

@aliemjay
Copy link
Contributor

@aliemjay aliemjay commented Mar 15, 2023

Why not? we already allow TyKind::Error.

Fixes #109072.

@rustbot
Copy link
Collaborator

rustbot commented Mar 15, 2023

r? @davidtwco

(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 Mar 15, 2023
WaffleLapkin
WaffleLapkin reviewed Mar 15, 2023
View reviewed changes
Copy link
Member

@WaffleLapkin WaffleLapkin left a comment

Choose a reason for hiding this comment

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

I guess this makes sense, just a small nitpick

compiler/rustc_infer/src/infer/canonical/canonicalizer.rs Outdated
Copy link
Member

@WaffleLapkin WaffleLapkin Mar 15, 2023

Choose a reason for hiding this comment

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

Could this match be exhaustive?

compiler-errors
compiler-errors reviewed Mar 15, 2023
View reviewed changes
tests/ui/nll/user-annotations/region-error-ice-109072.rs Outdated
Copy link
Contributor

@compiler-errors compiler-errors Mar 15, 2023

Choose a reason for hiding this comment

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

check-fail is the default mode i think? don't think it's needed

davidtwco
davidtwco approved these changes Mar 16, 2023
View reviewed changes
Copy link
Member

@davidtwco davidtwco 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 other comments resolved

@aliemjay aliemjay force-pushed the fix-ice-annotation branch from a21beb1 to a42cbdb Compare March 31, 2023 14:56
@aliemjay
Copy link
Contributor Author

aliemjay commented Mar 31, 2023

@bors r=davidtwco

@bors
Copy link
Collaborator

bors commented Mar 31, 2023

📌 Commit a42cbdb has been approved by davidtwco

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 31, 2023
@bors
Copy link
Collaborator

bors commented Mar 31, 2023

⌛ Testing commit a42cbdb with merge fadf164...

@bors
Copy link
Collaborator

bors commented Apr 1, 2023

☀️ Test successful - checks-actions
Approved by: davidtwco
Pushing fadf164 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Apr 1, 2023
@bors bors merged commit fadf164 into rust-lang:master Apr 1, 2023
@rustbot rustbot added this to the 1.70.0 milestone Apr 1, 2023
@rust-timer
Copy link
Collaborator

rust-timer commented Apr 1, 2023

Finished benchmarking commit (fadf164): comparison URL.

Overall result: no relevant changes - no action needed

@rustbot label: -perf-regression

Instruction count

This benchmark run did not return any relevant results for this metric.

Max RSS (memory usage)

This benchmark run did not return any relevant results for this metric.

Cycles

This benchmark run did not return any relevant results for this metric.

@aliemjay aliemjay deleted the fix-ice-annotation branch April 2, 2023 06:55
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@WaffleLapkin WaffleLapkin WaffleLapkin left review comments

@davidtwco davidtwco davidtwco approved these changes

+1 more reviewer

@compiler-errors compiler-errors compiler-errors left review comments

Reviewers whose approvals may not affect merge requirements

Assignees

@davidtwco davidtwco

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

ICE: unexpected region in query response: ReError

7 participants

@aliemjay @rustbot @bors @rust-timer @davidtwco @compiler-errors @WaffleLapkin