Merge pull request #4610 from rust-lang/rustup-2025-09-30

oli-obk · web-flow · commit 49439ecd17b4 · 2025-09-30T05:44:09.000Z
Automatic Rustup
diff --git a/rust-version b/rust-version
@@ -1 +1 @@
-f957826bff7a68b267ce75b1ea56352aed0cca0a
+29b7717de23f3969ceeb5bef5b01d9223f807655
diff --git a/src/machine.rs b/src/machine.rs
@@ -1340,7 +1340,7 @@ impl<'tcx> Machine<'tcx> for MiriMachine<'tcx> {
                     name = ecx.tcx.def_path_str(def_id),
                     krate = ecx.tcx.crate_name(def_id.krate),
                     decl_size = extern_decl_layout.size.bytes(),
-                    decl_align = extern_decl_layout.align.abi.bytes(),
+                    decl_align = extern_decl_layout.align.bytes(),
                     shim_size = info.size.bytes(),
                     shim_align = info.align.bytes(),
                 )

Original file line number	Diff line number	Diff line change
`@@ -1340,7 +1340,7 @@ impl<'tcx> Machine<'tcx> for MiriMachine<'tcx> {`
`1340`	`1340`	`name = ecx.tcx.def_path_str(def_id),`
`1341`	`1341`	`krate = ecx.tcx.crate_name(def_id.krate),`
`1342`	`1342`	`decl_size = extern_decl_layout.size.bytes(),`
`1343`		`- decl_align = extern_decl_layout.align.abi.bytes(),`
	`1343`	`+ decl_align = extern_decl_layout.align.bytes(),`
`1344`	`1344`	`shim_size = info.size.bytes(),`
`1345`	`1345`	`shim_align = info.align.bytes(),`
`1346`	`1346`	`)`