Skip to content

handle consts with param/infer in const_eval_resolve better - #99618

Merged
bors merged 2 commits into
rust-lang:masterfrom
compiler-errors:uhh-idk
Jul 26, 2022
Merged

handle consts with param/infer in const_eval_resolve better#99618
bors merged 2 commits into
rust-lang:masterfrom
compiler-errors:uhh-idk

Conversation

@compiler-errors

@compiler-errorscompiler-errors commented Jul 22, 2022•
edited
Loading

Copy link
Copy Markdown
Contributor

This PR addresses this thread here. Was this the change you were looking for @lcnr?

Interestingly, one test has begun to pass. Was that expected?

r? @lcnr

@rustbotrustbot added the T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. label Jul 22, 2022
@rustbot

rustbot commented Jul 22, 2022

Copy link
Copy Markdown
Collaborator

Some changes occurred in const_evaluatable.rs

cc @lcnr

Some changes occurred in src/tools/clippy

cc @rust-lang/clippy

@rust-highfiverust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jul 22, 2022
compiler-errors
compiler-errors commented Jul 22, 2022
View reviewed changes
Comment threadcompiler/rustc_infer/src/infer/mod.rs Outdated
lcnr
lcnr reviewed Jul 25, 2022
View reviewed changes
Comment threadcompiler/rustc_trait_selection/src/traits/const_evaluatable.rs Outdated
lcnr
lcnr reviewed Jul 25, 2022
View reviewed changes
Comment threadcompiler/rustc_infer/src/infer/mod.rs Outdated
@lcnr

lcnr commented Jul 25, 2022

Copy link
Copy Markdown
Contributor

2 nits, then r=me

thanks ❤️

@compiler-errors

compiler-errors commented Jul 26, 2022

Copy link
Copy Markdown
ContributorAuthor

@lcnr can you take one last look at this?

addressed the nits in the last commit, but I didn't know what to do when we had a ty::GenericArgKind::Const whose ty references params or infer -- do we want to replace that with a placeholder too? that's what I did, but idk if it's necessarily correct. 🤔

lcnr
lcnr reviewed Jul 26, 2022
View reviewed changes
Comment threadcompiler/rustc_infer/src/infer/mod.rs Outdated

@lcnrlcnrJul 26, 2022•
edited
Loading

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

that should be unreachable, so you should be able to bug! there

inference variables in the type of ty::Const is something we can't deal with right now, so if we encounter them either:

  • something went wrong and we should ICE
  • my understanding of const generics is flawed, so i also want to know about that

@compiler-errorscompiler-errorsJul 26, 2022

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

mkay

@compiler-errors

compiler-errors commented Jul 26, 2022

Copy link
Copy Markdown
ContributorAuthor

@bors r=lcnr

@bors

bors commented Jul 26, 2022

Copy link
Copy Markdown
Collaborator

📌 Commit b248647 has been approved by lcnr

It is now in the queue for this repository.

@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 Jul 26, 2022
Dylan-DPC added a commit to Dylan-DPC/rust that referenced this pull request Jul 26, 2022
@Dylan-DPC
Rollup merge ofrust-lang#99618- compiler-errors:uhh-idk, r=lcnr
a35e26d
handle consts with param/infer in `const_eval_resolve` better
This PR addresses [this thread here](rust-lang#99449 (comment)). Was this the change you were looking for `@lcnr?`
Interestingly, one test has begun to pass. Was that expected?
r? `@lcnr`
This was referenced Jul 26, 2022
Closed
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Jul 26, 2022
@bors
Auto merge ofrust-lang#99753- Dylan-DPC:rollup-k046940, r=Dylan-DPC
2614e43
Rollup of 5 pull requests
Successful merges:
- rust-lang#99618 (handle consts with param/infer in `const_eval_resolve` better)
- rust-lang#99666 (Restore `Opaque` behavior to coherence check)
- rust-lang#99692 (interpret, ptr_offset_from: refactor and test too-far-apart check)
- rust-lang#99739 (Remove erroneous E0133 code from an error message.)
- rust-lang#99748 (Use full type name instead of just saying `impl Trait` in "captures lifetime" error)
Failed merges:
r? `@ghost`
`@rustbot` modify labels: rollup
@bors
bors merged commit a39c00e into rust-lang:masterJul 26, 2022
@rustbotrustbot added this to the 1.64.0 milestone Jul 26, 2022
@compiler-errors
compiler-errors deleted the uhh-idk branch August 11, 2023 20:21
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@lcnrlcnrlcnr left review comments

Assignees

@lcnrlcnr

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

Development

Successfully merging this pull request may close these issues.

5 participants

@compiler-errors@rustbot@lcnr@bors@rust-highfive