diff options
| author | bors <bors@rust-lang.org> | 2024-05-28 18:21:24 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2024-05-28 18:21:24 +0000 |
| commit | 274499dd0ff53b81e93b80520f7afe25adaa2812 (patch) | |
| tree | d6217d2a53f9ba197558fa54675a461d3f37f91c /compiler/rustc_mir_transform/src | |
| parent | 8c4db851a7bb64173832e6602638204ebbd373a8 (diff) | |
| parent | faabc74625dd42a16a2dbd7685e88c79df5095d4 (diff) | |
| download | rust-274499dd0ff53b81e93b80520f7afe25adaa2812.tar.gz rust-274499dd0ff53b81e93b80520f7afe25adaa2812.zip | |
Auto merge of #125665 - matthiaskrgr:rollup-srkx0v1, r=matthiaskrgr
Rollup of 5 pull requests Successful merges: - #117671 (NVPTX: Avoid PassMode::Direct for args in C abi) - #125573 (Migrate `run-make/allow-warnings-cmdline-stability` to `rmake.rs`) - #125590 (Add a "Setup Python" action for github-hosted runners and remove unnecessary `CUSTOM_MINGW` environment variable) - #125598 (Make `ProofTreeBuilder` actually generic over `Interner`) - #125637 (rustfmt fixes) r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_mir_transform/src')
| -rw-r--r-- | compiler/rustc_mir_transform/src/instsimplify.rs | 6 | ||||
| -rw-r--r-- | compiler/rustc_mir_transform/src/validate.rs | 2 |
2 files changed, 3 insertions, 5 deletions
diff --git a/compiler/rustc_mir_transform/src/instsimplify.rs b/compiler/rustc_mir_transform/src/instsimplify.rs index 5e70b300f33..a54332b6f25 100644 --- a/compiler/rustc_mir_transform/src/instsimplify.rs +++ b/compiler/rustc_mir_transform/src/instsimplify.rs @@ -219,10 +219,8 @@ impl<'tcx> InstSimplifyContext<'tcx, '_> { for (i, field) in variant.fields.iter_enumerated() { let field_ty = field.ty(self.tcx, args); if field_ty == *cast_ty { - let place = place.project_deeper( - &[ProjectionElem::Field(i, *cast_ty)], - self.tcx, - ); + let place = place + .project_deeper(&[ProjectionElem::Field(i, *cast_ty)], self.tcx); let operand = if operand.is_move() { Operand::Move(place) } else { diff --git a/compiler/rustc_mir_transform/src/validate.rs b/compiler/rustc_mir_transform/src/validate.rs index 6df32169eec..8d7547d03e8 100644 --- a/compiler/rustc_mir_transform/src/validate.rs +++ b/compiler/rustc_mir_transform/src/validate.rs @@ -691,7 +691,7 @@ impl<'a, 'tcx> Visitor<'tcx> for TypeChecker<'a, 'tcx> { location, format!( "You can't project to field {f:?} of `DynMetadata` because \ - layout is weird and thinks it doesn't have fields." + layout is weird and thinks it doesn't have fields." ), ); } |
