diff options
| author | Matthias Krüger <matthias.krueger@famsik.de> | 2024-05-28 18:04:33 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-05-28 18:04:33 +0200 |
| commit | faabc74625dd42a16a2dbd7685e88c79df5095d4 (patch) | |
| tree | b5126b7461829ff333839d27fab29b3cd9bb936a /compiler/rustc_mir_transform/src | |
| parent | de2bf3687bc09e7fd8d58c2a50c6d628aa42169b (diff) | |
| parent | f1b0ca08a42e9cbfcd91e25174be2e36cdaf2651 (diff) | |
| download | rust-faabc74625dd42a16a2dbd7685e88c79df5095d4.tar.gz rust-faabc74625dd42a16a2dbd7685e88c79df5095d4.zip | |
Rollup merge of #125637 - nnethercote:rustfmt-fixes, r=GuillaumeGomez
rustfmt fixes The `rmake.rs` entries in `rustfmt.toml` are causing major problems for `x fmt`. This PR removes them and does some minor related cleanups. r? ``@GuillaumeGomez``
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." ), ); } |
