Skip to content

Deduplicate operand creation between scalars, non-scalars and string patterns - #136121

Merged
bors merged 3 commits into
rust-lang:masterfrom
oli-obk:push-zzvxlynmnqpp
Jan 29, 2025
Merged

Deduplicate operand creation between scalars, non-scalars and string patterns#136121
bors merged 3 commits into
rust-lang:masterfrom
oli-obk:push-zzvxlynmnqpp

Conversation

@oli-obk

@oli-obkoli-obk commented Jan 27, 2025•
edited
Loading

Copy link
Copy Markdown
Contributor

just something that felt duplicated and would make pattern type handling a bit more roundabout.

@rustbot

rustbot commented Jan 27, 2025

Copy link
Copy Markdown
Collaborator

r? @estebank

rustbot has assigned @estebank.
They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.

Use r? to explicitly pick a reviewer

@rustbotrustbot 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 Jan 27, 2025
compiler-errors
compiler-errors reviewed Jan 27, 2025
View reviewed changes
Comment threadcompiler/rustc_mir_build/src/builder/matches/test.rs
test.span,
"matching on `String` went through without enabling string_deref_patterns"
);
block = eq_block;

@compiler-errorscompiler-errorsJan 27, 2025

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.

Leave a comment about why we update these. i.e. something like we're lowering to X.

@oli-obkoli-obkJan 28, 2025

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.

done

estebank
estebank reviewed Jan 28, 2025
View reviewed changes
Comment threadcompiler/rustc_mir_build/src/builder/matches/test.rs
Comment on lines +154 to +155
match ty.kind() {
ty::Adt(def, _) if tcx.is_lang_item(def.did(), LangItem::String) => {

@estebankestebankJan 28, 2025

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.

Any stylistic reason for the match with a single arm over the let chain?

@oli-obkoli-obkJan 28, 2025

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.

that I'll be adding a new variant immediately in a follow-up PR 😆

@estebank

estebank commented Jan 28, 2025

Copy link
Copy Markdown
Contributor

@bors r+

@bors

bors commented Jan 28, 2025

Copy link
Copy Markdown
Collaborator

📌 Commit d62f885 has been approved by estebank

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 Jan 28, 2025
@fmeasefmease mentioned this pull request Jan 29, 2025
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Jan 29, 2025
@bors
Auto merge ofrust-lang#136227- fmease:rollup-ewpvznh, r=fmease
e384432
Rollup of 9 pull requests
Successful merges:
- rust-lang#136121 (Deduplicate operand creation between scalars, non-scalars and string patterns)
- rust-lang#136134 (Fix SIMD codegen tests on LLVM 20)
- rust-lang#136153 (Locate asan-odr-win with other sanitizer tests)
- rust-lang#136161 (rustdoc: add nobuild typescript checking to our JS)
- rust-lang#136166 (interpret: is_alloc_live: check global allocs last)
- rust-lang#136168 (GCI: Don't try to eval / collect mono items inside overly generic free const items)
- rust-lang#136170 (Reject unsound toggling of Arm atomics-32 target feature)
- rust-lang#136176 (Render pattern types nicely in mir dumps)
- rust-lang#136186 (uefi: process: Fix args)
r? `@ghost`
`@rustbot` modify labels: rollup
bors added a commit to rust-lang-ci/rust that referenced this pull request Jan 29, 2025
@bors
Auto merge ofrust-lang#136227- fmease:rollup-ewpvznh, r=fmease
a1d7676
Rollup of 9 pull requests
Successful merges:
- rust-lang#136121 (Deduplicate operand creation between scalars, non-scalars and string patterns)
- rust-lang#136134 (Fix SIMD codegen tests on LLVM 20)
- rust-lang#136153 (Locate asan-odr-win with other sanitizer tests)
- rust-lang#136161 (rustdoc: add nobuild typescript checking to our JS)
- rust-lang#136166 (interpret: is_alloc_live: check global allocs last)
- rust-lang#136168 (GCI: Don't try to eval / collect mono items inside overly generic free const items)
- rust-lang#136170 (Reject unsound toggling of Arm atomics-32 target feature)
- rust-lang#136176 (Render pattern types nicely in mir dumps)
- rust-lang#136186 (uefi: process: Fix args)
r? `@ghost`
`@rustbot` modify labels: rollup
@bors
bors merged commit 8d183d2 into rust-lang:masterJan 29, 2025
@rustbotrustbot added this to the 1.86.0 milestone Jan 29, 2025
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Jan 29, 2025
@rust-timer
Unrolled build forrust-lang#136121
5545916
Rollup merge of rust-lang#136121 - oli-obk:push-zzvxlynmnqpp, r=estebank
Deduplicate operand creation between scalars, non-scalars and string patterns
just something that felt duplicated and would make pattern type handling a bit more roundabout.
github-actionsBot pushed a commit to tautschnig/verify-rust-std that referenced this pull request Mar 11, 2025
@borsgitbot
Auto merge ofrust-lang#136227- fmease:rollup-ewpvznh, r=fmease
109ac8f
Rollup of 9 pull requests
Successful merges:
- rust-lang#136121 (Deduplicate operand creation between scalars, non-scalars and string patterns)
- rust-lang#136134 (Fix SIMD codegen tests on LLVM 20)
- rust-lang#136153 (Locate asan-odr-win with other sanitizer tests)
- rust-lang#136161 (rustdoc: add nobuild typescript checking to our JS)
- rust-lang#136166 (interpret: is_alloc_live: check global allocs last)
- rust-lang#136168 (GCI: Don't try to eval / collect mono items inside overly generic free const items)
- rust-lang#136170 (Reject unsound toggling of Arm atomics-32 target feature)
- rust-lang#136176 (Render pattern types nicely in mir dumps)
- rust-lang#136186 (uefi: process: Fix args)
r? `@ghost`
`@rustbot` modify labels: rollup
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@estebankestebankestebank left review comments
+1 more reviewer
@compiler-errorscompiler-errorscompiler-errors left review comments
Reviewers whose approvals may not affect merge requirements

Assignees

@estebankestebank

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

Development

Successfully merging this pull request may close these issues.

5 participants

@oli-obk@rustbot@estebank@bors@compiler-errors