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

Do not ICE on ty::Error as an error must already have been reported #83297

Merged
merged 2 commits into from
Mar 20, 2021
Merged

Do not ICE on ty::Error as an error must already have been reported #83297

merged 2 commits into from
Mar 20, 2021

Conversation

oli-obk
Copy link
Contributor

@oli-obk oli-obk commented Mar 19, 2021

fixes #83253

@rust-highfive
Copy link
Collaborator

r? @petrochenkov

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

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Mar 19, 2021
@SNCPlay42
Copy link
Contributor

Does this fix the version in #83253 (comment)?

@oli-obk
Copy link
Contributor Author

oli-obk commented Mar 19, 2021

Does this fix the version in #83253 (comment)?

yes, and I added a regression test for this, too

@rust-log-analyzer

This comment has been minimized.

Sign in to view
@oli-obk oli-obk force-pushed the why_bug_today_if_you_can_delay_to_tomorrow branch from 38226ed to 9577058 Compare March 19, 2021 13:45
@petrochenkov
Copy link
Contributor

@bors r+

@bors
Copy link
Contributor

bors commented Mar 19, 2021

📌 Commit 9577058 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-review Status: Awaiting review from the assignee but also interested parties. labels Mar 19, 2021
@Dylan-DPC-zz Dylan-DPC-zz mentioned this pull request Mar 19, 2021
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Mar 19, 2021
@bors
Auto merge of rust-lang#83308 - Dylan-DPC:rollup-p2j6sy8, r=Dylan-DPC
6bfbf0c 
Rollup of 8 pull requests

Successful merges:

 - rust-lang#79986 (Only build help popup when it's really needed)
 - rust-lang#82570 (Add `as_str` method for split whitespace str iterators)
 - rust-lang#83244 (Fix overflowing length in Vec<ZST> to VecDeque)
 - rust-lang#83254 (Include output stream in `panic!()` documentation)
 - rust-lang#83269 (Revert the second deprecation of collections::Bound)
 - rust-lang#83277 (Mark early otherwise optimization unsound)
 - rust-lang#83285 (Update LLVM to bring in SIMD updates for WebAssembly)
 - rust-lang#83297 (Do not ICE on ty::Error as an error must already have been reported)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 51a29cb into rust-lang:master Mar 20, 2021
@rustbot rustbot added this to the 1.52.0 milestone Mar 20, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@petrochenkov petrochenkov

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

ICE: usize: cannot relate constants of different types', compiler/rustc_middle/src/ty/relate.rs:502:5
7 participants
@oli-obk @rust-highfive @SNCPlay42 @rust-log-analyzer @petrochenkov @bors @rustbot