Skip to content

Commit c8285db

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 e1553be + 78adf4e commit c8285db

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

etc/thumbv7em-none-eabi-renamed.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,5 +19,5 @@
1919
},
2020
"panic-strategy": "abort",
2121
"relocation-model": "static",
22-
"target-pointer-width": "32"
22+
"target-pointer-width": 32
2323
}

0 commit comments

Comments
 (0)