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.

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

Return early to avoid ICE #72775

Merged
merged 1 commit into from
Jun 2, 2020
Merged

Return early to avoid ICE #72775

merged 1 commit into from
Jun 2, 2020

Conversation

JohnTitor
Copy link
Member

Fixes #72766

@rust-highfive
Copy link
Collaborator

r? @cramertj

(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 May 30, 2020
Comment on lines +326 to +330
// Do not check on infer_types to avoid panic in evaluate_obligation.
if ty.has_infer_types() {
return false;
}
let ty = cx.tcx.erase_regions(&ty);
Copy link
Contributor

Choose a reason for hiding this comment

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

Isn't src/tools/clippy a separate repo?

Copy link
Member Author

Choose a reason for hiding this comment

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

IIUC clippy is now subtree and we can make a change here not to break it, like #72466. cc @oli-obk right?

Copy link
Contributor

Choose a reason for hiding this comment

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

correct

@estebank
Copy link
Contributor

r? @estebank

r=me after addressing the comment re:clippy (I think you need to open a PR against https://github.com/rust-lang/rust-clippy instead of changing it here)

@oli-obk
Copy link
Contributor

oli-obk commented May 31, 2020

@bors r=estebank

We actually have to fix clippy in tree nowadays as CI is blocked on it. src/tools/clippy is synchronized with the clippy repo independently of anything happening here

@bors
Copy link
Contributor

bors commented May 31, 2020

📌 Commit 7750357 has been approved by estebank

@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 May 31, 2020
RalfJung added a commit to RalfJung/rust that referenced this pull request Jun 1, 2020
Dylan-DPC-zz pushed a commit to Dylan-DPC-zz/rust that referenced this pull request Jun 2, 2020
bors added a commit to rust-lang-ci/rust that referenced this pull request Jun 2, 2020
Rollup of 10 pull requests

Successful merges:

 - rust-lang#72775 (Return early to avoid ICE)
 - rust-lang#72795 (Add a test for `$:ident` in proc macro input)
 - rust-lang#72822 (remove trivial calls to mk_const)
 - rust-lang#72825 (Clarify errors and warnings about the transition to the new asm!)
 - rust-lang#72827 (changed *nix to Unix-like)
 - rust-lang#72880 (Clean up E0637 explanation)
 - rust-lang#72886 (Remove allow missing_debug_implementations for MaybeUninit)
 - rust-lang#72889 (rustc: Remove the `--passive-segments` LLD flag on wasm)
 - rust-lang#72891 (Add associated consts MIN/MAX for Wrapping<Int>)
 - rust-lang#72893 (test miri-unleash TLS accesses)

Failed merges:

r? @ghost
@bors bors merged commit 8a68fc6 into rust-lang:master Jun 2, 2020
@JohnTitor JohnTitor deleted the await-sugg branch June 2, 2020 08:41
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Missing .await causes ICE / StableHasher: unexpected region '_#2r
6 participants