Skip to content

implement or-patterns for pattern types - #139909

Merged
bors merged 6 commits into
rust-lang:masterfrom
oli-obk:or-patterns
Apr 29, 2025
Merged

implement or-patterns for pattern types#139909
bors merged 6 commits into
rust-lang:masterfrom
oli-obk:or-patterns

Conversation

@oli-obk

@oli-obkoli-obk commented Apr 16, 2025•
edited
Loading

Copy link
Copy Markdown
Contributor

These are necessary to represent NonZeroI32, as the range for that is ..0 | 1... The rustc_scalar_layout_range_* attributes avoided this by just implementing wraparound and having a single 1..=-1 range effectively. See https://rust-lang.zulipchat.com/#narrow/channel/481660-t-lang.2Fpattern-types/topic/.60or.20pattern.60.20representation.20in.20type.20system/with/504217694 for some background discussion

cc #123646

r? @BoxyUwU

@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 Apr 16, 2025
@rustbot

rustbot commented Apr 16, 2025

Copy link
Copy Markdown
Collaborator

changes to the core type system

cc @compiler-errors, @lcnr

Some changes occurred to the CTFE machinery

cc @RalfJung, @oli-obk, @lcnr

Some changes occurred in src/tools/clippy

cc @rust-lang/clippy

Some changes occurred to the CTFE / Miri interpreter

cc @rust-lang/miri

changes to the core type system

cc @compiler-errors, @lcnr

Some changes occurred in src/tools/rustfmt

cc @rust-lang/rustfmt

HIR ty lowering was modified

cc @fmease

RalfJung
RalfJung reviewed Apr 16, 2025
View reviewed changes
Comment threadcompiler/rustc_const_eval/src/interpret/validity.rs
ytmimi
ytmimi reviewed Apr 16, 2025
View reviewed changes
Comment threadsrc/tools/rustfmt/src/types.rs
RalfJung
RalfJung reviewed Apr 17, 2025
View reviewed changes
Comment threadcompiler/rustc_const_eval/src/interpret/validity.rs Outdated
BoxyUwU
BoxyUwU reviewed Apr 28, 2025
View reviewed changes

@BoxyUwUBoxyUwU left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

I'm not sure if for ty::TyKind::Pat it makes sense to use a general top level Or for this 🤔 Though I don't really have a good idea for how everything will turn out in the end so I guess its fine to just do this for now and figure things out at a later date

Comment threadcompiler/rustc_trait_selection/src/traits/wf.rs Outdated
Comment threadcompiler/rustc_trait_selection/src/traits/wf.rs Outdated
Comment threadcompiler/rustc_const_eval/src/interpret/intrinsics.rs Outdated
@BoxyUwUBoxyUwU added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Apr 28, 2025
@oli-obk

oli-obk commented Apr 28, 2025

Copy link
Copy Markdown
ContributorAuthor

@rustbot ready

@rustbotrustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Apr 28, 2025
@oli-obk
oli-obkforce-pushed the or-patterns branch 2 times, most recently from 3c4edc5 to 5de9ffaCompareApril 28, 2025 07:49
@BoxyUwU

BoxyUwU commented Apr 29, 2025

Copy link
Copy Markdown
Member

@bors r+

@bors

bors commented Apr 29, 2025

Copy link
Copy Markdown
Collaborator

📌 Commit b023856 has been approved by BoxyUwU

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 Apr 29, 2025
@tgross35tgross35 mentioned this pull request Apr 29, 2025
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Apr 29, 2025
@bors
Auto merge ofrust-lang#140474- tgross35:rollup-rdkao89, r=tgross35
7450913
Rollup of 7 pull requests
Successful merges:
- rust-lang#138344 (Enable `reliable_f16_math` on x86)
- rust-lang#139909 (implement or-patterns for pattern types)
- rust-lang#140392 (compiletest: Remove the libtest-based executor and its dependency)
- rust-lang#140400 (PassWrapper: adapt for llvm/llvm-project@d3d856ad8469)
- rust-lang#140422 (unwind: bump `unwinding` dependency to 0.2.6)
- rust-lang#140432 (Update documentation for `fn target_config`)
- rust-lang#140433 (Replace the \01__gnu_mcount_nc to LLVM intrinsic for additional ARM targets)
r? `@ghost`
`@rustbot` modify labels: rollup
@bors
bors merged commit a20fe8f into rust-lang:masterApr 29, 2025
@rustbotrustbot added this to the 1.88.0 milestone Apr 29, 2025
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Apr 29, 2025
@rust-timer
Unrolled build forrust-lang#139909
527f766
Rollup merge of rust-lang#139909 - oli-obk:or-patterns, r=BoxyUwU
implement or-patterns for pattern types
These are necessary to represent `NonZeroI32`, as the range for that is `..0 | 1..`. The `rustc_scalar_layout_range_*` attributes avoided this by just implementing wraparound and having a single `1..=-1` range effectively. See https://rust-lang.zulipchat.com/#narrow/channel/481660-t-lang.2Fpattern-types/topic/.60or.20pattern.60.20representation.20in.20type.20system/with/504217694 for some background discussion
cc rust-lang#123646
r? `@BoxyUwU`
flip1995 pushed a commit to flip1995/rust that referenced this pull request May 1, 2025
@tgross35
Rollup merge ofrust-lang#139909- oli-obk:or-patterns, r=BoxyUwU
6d58910
implement or-patterns for pattern types
These are necessary to represent `NonZeroI32`, as the range for that is `..0 | 1..`. The `rustc_scalar_layout_range_*` attributes avoided this by just implementing wraparound and having a single `1..=-1` range effectively. See https://rust-lang.zulipchat.com/#narrow/channel/481660-t-lang.2Fpattern-types/topic/.60or.20pattern.60.20representation.20in.20type.20system/with/504217694 for some background discussion
cc rust-lang#123646
r? `@BoxyUwU`
github-actionsBot pushed a commit to model-checking/verify-rust-std that referenced this pull request May 9, 2025
@bors
Auto merge ofrust-lang#140474- tgross35:rollup-rdkao89, r=tgross35
b8f55d5
Rollup of 7 pull requests
Successful merges:
- rust-lang#138344 (Enable `reliable_f16_math` on x86)
- rust-lang#139909 (implement or-patterns for pattern types)
- rust-lang#140392 (compiletest: Remove the libtest-based executor and its dependency)
- rust-lang#140400 (PassWrapper: adapt for llvm/llvm-project@d3d856ad8469)
- rust-lang#140422 (unwind: bump `unwinding` dependency to 0.2.6)
- rust-lang#140432 (Update documentation for `fn target_config`)
- rust-lang#140433 (Replace the \01__gnu_mcount_nc to LLVM intrinsic for additional ARM targets)
r? `@ghost`
`@rustbot` modify labels: rollup
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@RalfJungRalfJungRalfJung left review comments
@BoxyUwUBoxyUwUBoxyUwU left review comments
@ytmimiytmimiytmimi left review comments

Assignees

@BoxyUwUBoxyUwU

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

Development

Successfully merging this pull request may close these issues.

6 participants

@oli-obk@rustbot@BoxyUwU@bors@RalfJung@ytmimi