Skip to content

Commit 2dea859

Browse files
committed
Auto merge of #146052 - matthiaskrgr:rollup-cfxx9m6, r=matthiaskrgr
Rollup of 4 pull requests Successful merges: - rust-lang/rust#144443 (Make target pointer width in target json an integer) - rust-lang/rust#145174 (Ensure consistent drop for panicking drop in hint::select_unpredictable) - rust-lang/rust#145592 (Fix format string grammar in docs and improve alignment error message for rust-lang/rust#144023) - rust-lang/rust#145931 (Clarify that align_offset overaligns) r? `@ghost` `@rustbot` modify labels: rollup
2 parents 93eae74 + 349ee49 commit 2dea859

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

tests/x86_64-unknown-kernel.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"llvm-target": "x86_64-unknown-none",
33
"target-endian": "little",
4-
"target-pointer-width": "64",
4+
"target-pointer-width": 64,
55
"target-c-int-width": 32,
66
"data-layout": "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-i128:128-f80:128-n8:16:32:64-S128",
77
"arch": "x86_64",

0 commit comments

Comments
 (0)