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

rustc_const_eval: adopt let else in more places #94143

Merged
merged 2 commits into from
Feb 22, 2022

Conversation

est31
Copy link
Member

@est31 est31 commented Feb 19, 2022

Continuation of #89933, #91018, #91481, #93046, #93590, #94011.

I have extended my clippy lint to also recognize tuple passing and match statements. The diff caused by fixing it is way above 1 thousand lines. Thus, I split it up into multiple pull requests to make reviewing easier. This PR handles rustc_const_eval.

@rustbot rustbot added the T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. label Feb 19, 2022
@rust-highfive
Copy link
Collaborator

Some changes occured to the CTFE / Miri engine

cc @rust-lang/miri

@rust-highfive
Copy link
Collaborator

r? @lcnr

(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 Feb 19, 2022
@est31 est31 force-pushed the let_else_const_eval branch from 440813f to 942223c Compare February 19, 2022 00:33
@est31 est31 force-pushed the let_else_const_eval branch from 942223c to 5cc292e Compare February 19, 2022 00:56
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Feb 19, 2022
Adopt let else in more places

Continuation of rust-lang#89933, rust-lang#91018, rust-lang#91481, rust-lang#93046, rust-lang#93590, rust-lang#94011.

I have extended my clippy lint to also recognize tuple passing and match statements. The diff caused by fixing it is way above 1 thousand lines. Thus, I split it up into multiple pull requests to make reviewing easier. This is the biggest of these PRs and handles the changes outside of rustdoc, rustc_typeck, rustc_const_eval, rustc_trait_selection, which were handled in PRs rust-lang#94139, rust-lang#94142, rust-lang#94143, rust-lang#94144.
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Feb 19, 2022
Adopt let else in more places

Continuation of rust-lang#89933, rust-lang#91018, rust-lang#91481, rust-lang#93046, rust-lang#93590, rust-lang#94011.

I have extended my clippy lint to also recognize tuple passing and match statements. The diff caused by fixing it is way above 1 thousand lines. Thus, I split it up into multiple pull requests to make reviewing easier. This is the biggest of these PRs and handles the changes outside of rustdoc, rustc_typeck, rustc_const_eval, rustc_trait_selection, which were handled in PRs rust-lang#94139, rust-lang#94142, rust-lang#94143, rust-lang#94144.
Copy link
Contributor

@lcnr lcnr left a comment

Choose a reason for hiding this comment

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

nit, then r=me

compiler/rustc_const_eval/src/interpret/memory.rs Outdated Show resolved Hide resolved
Co-authored-by: lcnr <[email protected]>
@lcnr
Copy link
Contributor

lcnr commented Feb 21, 2022

@bors r+ rollup

@bors
Copy link
Contributor

bors commented Feb 21, 2022

📌 Commit 413f3f7 has been approved by lcnr

@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 Feb 21, 2022
bors added a commit to rust-lang-ci/rust that referenced this pull request Feb 21, 2022
…askrgr

Rollup of 10 pull requests

Successful merges:

 - rust-lang#91192 (Some improvements to the async docs)
 - rust-lang#94143 (rustc_const_eval: adopt let else in more places)
 - rust-lang#94156 (Gracefully handle non-UTF-8 string slices when pretty printing)
 - rust-lang#94186 (Update pin_static_ref stabilization version.)
 - rust-lang#94189 (Implement LowerHex on Scalar to clean up their display in rustdoc)
 - rust-lang#94190 (Use Metadata::modified instead of FileTime::from_last_modification_ti…)
 - rust-lang#94203 (CTFE engine: Scalar: expose size-generic to_(u)int methods)
 - rust-lang#94211 (Better error if the user tries to do assignment ... else)
 - rust-lang#94215 (trait system: comments and small nonfunctional changes)
 - rust-lang#94220 (Correctly handle miniz_oxide extern crate declaration)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit ea7f7f7 into rust-lang:master Feb 22, 2022
@rustbot rustbot added this to the 1.61.0 milestone Feb 22, 2022
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. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants