Skip to content

Commit c6dfa53

Browse files
authored
Rollup merge of #147134 - workingjubilee:remove-explicit-abialign-deref, r=Zalathar
remove explicit deref of AbiAlign for most methods Much of the compiler calls functions on Align projected from AbiAlign. AbiAlign impls Deref to its inner Align, so we can simplify these away. Also, it will minimize disruption when AbiAlign is removed. For now, preserve usages that might resolve to PartialOrd or PartialEq, as those have odd inference.
2 parents 538c9e8 + 829c276 commit c6dfa53

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

src/machine.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1341,7 +1341,7 @@ impl<'tcx> Machine<'tcx> for MiriMachine<'tcx> {
13411341
name = ecx.tcx.def_path_str(def_id),
13421342
krate = ecx.tcx.crate_name(def_id.krate),
13431343
decl_size = extern_decl_layout.size.bytes(),
1344-
decl_align = extern_decl_layout.align.abi.bytes(),
1344+
decl_align = extern_decl_layout.align.bytes(),
13451345
shim_size = info.size.bytes(),
13461346
shim_align = info.align.bytes(),
13471347
)

0 commit comments

Comments
 (0)