Use more slice patterns inside the compiler #128762
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
fmease
added
the
C-cleanup
rustbot
added
A-query-system
This comment has been minimized.
This comment has been minimized.
fmease
force-pushed
the
use-more-slice-pats
branch
from
0257ce3
to
8868f91
Compare
|
Some changes occurred in match checking cc @Nadrieril Some changes occurred in coverage instrumentation. cc @Zalathar Some changes occurred to MIR optimizations cc @rust-lang/wg-mir-opt These commits modify compiler targets. |
|
r? compiler |
This comment has been minimized.
This comment has been minimized.
compiler/rustc_ast/src/ast.rs
Outdated
| @@ -585,7 +585,7 @@ impl Pat { | |||
| } | |||
| // A slice/array pattern `[P]` can be reparsed as `[T]`, an unsized array, | |||
| // when `P` can be reparsed as a type `T`. | |||
| PatKind::Slice(pats) if pats.len() == 1 => pats[0].to_ty().map(TyKind::Slice)?, | |||
| PatKind::Slice(pats) if let [pat] = &**pats => pat.to_ty().map(TyKind::Slice)?, | |||
There was a problem hiding this comment.
I would kinda prefer we spell this as pats.as_slice() or &pats[..].
&** is kinda an eyesore, and the implicit autoderef of either strategies makes it less annoying if we change around the underlying type reprs.
| @@ -292,9 +292,9 @@ impl<'tcx> Cx<'tcx> { | |||
| } else { | |||
| let attrs = tcx.hir().attrs(expr.hir_id); | |||
| if attrs.iter().any(|a| a.name_or_empty() == sym::rustc_box) { | |||
| if attrs.len() != 1 { | |||
| if let [attr] = attrs { | |||
There was a problem hiding this comment.
You need to invert this check.
| @@ -898,8 +898,8 @@ impl<'a, 'tcx> Visitor<'tcx> for TypeChecker<'a, 'tcx> { | |||
| self.param_env, | |||
| adt_def.non_enum_variant().fields[field].ty(self.tcx, args), | |||
| ); | |||
| if fields.len() == 1 { | |||
| let src_ty = fields.raw[0].ty(self.body, self.tcx); | |||
| if let [field] = &*fields.raw { | |||
There was a problem hiding this comment.
:( this is kinda annoying to have to do, but I guess at least equally annoying as fields.raw[0].
fmease
force-pushed
the
use-more-slice-pats
branch
from
8868f91
to
b6070a0
Compare
fmease
force-pushed
the
use-more-slice-pats
branch
from
b6070a0
to
a3e3eca
Compare
This comment has been minimized.
This comment has been minimized.
fmease
added
the
rla-silenced
fmease
force-pushed
the
use-more-slice-pats
branch
from
a3e3eca
to
c4c518d
Compare
fmease
removed
the
rla-silenced
compiler-errors
approved these changes
Aug 10, 2024
|
@bors r+ |
bors
added
S-waiting-on-bors
matthiaskrgr
added a commit
to matthiaskrgr/rust
that referenced
this pull request
Aug 11, 2024
…iler-errors Use more slice patterns inside the compiler Nothing super noteworthy. Just replacing the common 'fragile' pattern of "length check followed by indexing or unwrap" with slice patterns for legibility and 'robustness'. r? ghost
This was referenced Aug 11, 2024
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Aug 11, 2024
…iaskrgr Rollup of 6 pull requests Successful merges: - rust-lang#120314 (core: optimise Debug impl for ascii::Char) - rust-lang#128536 (Preliminary cleanup of `WitnessPat` hoisting/printing) - rust-lang#128592 (Promote aarch64-apple-darwin to Tier 1) - rust-lang#128762 (Use more slice patterns inside the compiler) - rust-lang#128875 (rm `import.used`) - rust-lang#128882 (make LocalWaker::will_wake consistent with Waker::will_wake) r? `@ghost` `@rustbot` modify labels: rollup
rust-timer
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Aug 11, 2024
Rollup merge of rust-lang#128762 - fmease:use-more-slice-pats, r=compiler-errors Use more slice patterns inside the compiler Nothing super noteworthy. Just replacing the common 'fragile' pattern of "length check followed by indexing or unwrap" with slice patterns for legibility and 'robustness'. r? ghost
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Nothing super noteworthy. Just replacing the common 'fragile' pattern of "length check followed by indexing or unwrap" with slice patterns for legibility and 'robustness'.
r? ghost