-
Notifications
You must be signed in to change notification settings - Fork 13.7k
Make target pointer width in target json an integer #144443
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
bors
merged 5 commits into
rust-lang:master
from
WaffleLapkin:integer-target-pointer-width
Aug 31, 2025
Merged
Make target pointer width in target json an integer #144443
bors
merged 5 commits into
rust-lang:master
from
WaffleLapkin:integer-target-pointer-width
Aug 31, 2025
+31
−41
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Noratrieb is not on the review rotation at the moment.
They may take a while to respond.
@rustbot
rustbot
added
A-compiletest
Area: The compiletest test runner
A-run-make
Area: port run-make Makefiles to rmake.rs
A-testsuite
Area: The testsuite used to check the correctness of rustc
S-waiting-on-review
Status: Awaiting review from the assignee but also interested parties.
T-bootstrap
Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap)
T-compiler
Relevant to the compiler team, which will review and decide on the PR/issue.
labels
Jul 25, 2025
This PR modifies run-make tests.
cc @jieyouxu
These commits modify compiler targets.
(See the Target Tier Policy.)
Some changes occurred in src/tools/compiletest
cc @jieyouxu
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'm unsure if it's worth breaking everyone over such a minor improvement.. maybe? maybe not?
This comment has been minimized.
This comment has been minimized.
I'm inclined to say yes, but it would probably be good to get this merged today so it can be in the same nightly as the other breaking change instead of two consecutive nightlies (it would also be fine to do that, but less cool)
I'm unsure if it's worth breaking everyone over such a minor improvement.. maybe? maybe not?
We already did that with #144443... the current state is just inconsistent.
But, no strong opinion.
@WaffleLapkin
WaffleLapkin
force-pushed
the
integer-target-pointer-width
branch
from
July 25, 2025 11:55
bb5b5c5 to
283f21b
Compare
@Noratrieb what's the other breaking change? #142352 has been merged for over a month..
This comment has been minimized.
This comment has been minimized.
@WaffleLapkin
WaffleLapkin
force-pushed
the
integer-target-pointer-width
branch
from
July 25, 2025 12:35
283f21b to
267f0bd
Compare
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
@Noratrieb what's the other breaking change? #142352 has been merged for over a month..
Uh, but then why did Miri CI only start failing today?
Something changed in 9748d87...b56aaec.
@WaffleLapkin
WaffleLapkin
force-pushed
the
integer-target-pointer-width
branch
from
July 25, 2025 13:33
b64ab4a to
b2871e5
Compare
The breaking change was probably #144218.
It might be that the field of wrong type just got ignored, which is exactly why Nora ported this to serde.
You are right indeed. The code in #142352:
if let Some(s) = obj.remove(name).and_then(|b| b.as_u64()) { base.$key_name = s as $int_ty; }
and_then(|b| b.as_u64()) makes it so non-integers are ignored.
This comment has been minimized.
This comment has been minimized.
@WaffleLapkin
WaffleLapkin
force-pushed
the
integer-target-pointer-width
branch
from
August 27, 2025 21:49
fe01e35 to
2d8cb59
Compare
This PR was rebased onto a different master commit. Here's a range-diff highlighting what actually changed.
Rebasing is a normal part of keeping PRs up to date, so no action is needed—this note is just to help reviewers.
#145909 got merged, so this should be good to go. I can't imagine what else can break ^^'
@WaffleLapkin It seems to be on S-waiting-on-author
@bors r=Noratrieb
@bors
bors
added
S-waiting-on-bors
Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
and removed
S-waiting-on-author
Status: This is awaiting some action (such as code changes or more information) from the author.
labels
Aug 31, 2025
bors
added a commit
that referenced
this pull request
Aug 31, 2025
Rollup of 4 pull requests Successful merges: - #144443 (Make target pointer width in target json an integer) - #145174 (Ensure consistent drop for panicking drop in hint::select_unpredictable) - #145592 (Fix format string grammar in docs and improve alignment error message for #144023) - #145931 (Clarify that align_offset overaligns) r? `@ghost` `@rustbot` modify labels: rollup
rust-timer
added a commit
that referenced
this pull request
Aug 31, 2025
Rollup merge of #144443 - WaffleLapkin:integer-target-pointer-width, r=Noratrieb Make target pointer width in target json an integer r? Noratrieb cc `@RalfJung` (https://github.com/rust-lang/rust/pull/142352/files#r2230380120) try-job: x86_64-rust-for-linux
yay :3
ojeda
added a commit
to Rust-for-Linux/linux
that referenced
this pull request
Aug 31, 2025
Starting with Rust 1.91.0 (expected 2025年10月30日), the target spec format has changed the type of the `target-pointer-width` key from string to integer [1]. Thus conditionally use one or the other depending on the version. Cc: Waffle Maybe <waffle.lapkin@gmail.com> Link: rust-lang/rust#144443 [1] Link: https://lore.kernel.org/r/20250829195525.721664-1-ojeda@kernel.org Signed-off-by: Miguel Ojeda <ojeda@kernel.org>
github-actions bot
pushed a commit
to rust-lang/compiler-builtins
that referenced
this pull request
Sep 1, 2025
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
github-actions bot
pushed a commit
to rust-lang/miri
that referenced
this pull request
Sep 1, 2025
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
phil-opp
added a commit
to rust-osdev/bootloader
that referenced
this pull request
Sep 2, 2025
ojeda
added a commit
to ojeda/rust
that referenced
this pull request
Sep 3, 2025
This upgrades the Rust CI from v6.16-rc1 plus a temporary commit for the >= 1.91 target spec [1] to v6.17-rc3 with two temporary commits -- one for the same target spec format change [1] and another for the `file_as_c_str` change [2]. Link: rust-lang#144443 [1] Link: rust-lang#145928 [2] Signed-off-by: Miguel Ojeda <ojeda@kernel.org>
ojeda
added a commit
to ojeda/rust
that referenced
this pull request
Sep 3, 2025
This upgrades the Rust CI from v6.16-rc1 plus a temporary commit for the >= 1.91 target spec [1] to v6.17-rc3 with two commits pending to be merged upstream -- one for the same target spec format change [1] and another for the `file_as_c_str` change [2]. Link: rust-lang#144443 [1] Link: rust-lang#145928 [2] Signed-off-by: Miguel Ojeda <ojeda@kernel.org>
ojeda
added a commit
to ojeda/rust
that referenced
this pull request
Sep 3, 2025
This upgrades the Rust CI from v6.16-rc1 plus a temporary commit for the >= 1.91 target spec [1] to v6.17-rc3 with two commits pending to be merged upstream -- one for the same target spec format change [1] and another for the `file_as_c_str` change [2]. Link: rust-lang#144443 [1] Link: rust-lang#145928 [2] Signed-off-by: Miguel Ojeda <ojeda@kernel.org>
Zalathar
added a commit
to Zalathar/rust
that referenced
this pull request
Sep 3, 2025
CI: rfl: move job forward to Linux v6.17-rc3 plus 2 commits This upgrades the Rust CI from v6.16-rc1 plus a temporary commit for the >= 1.91 target spec [1] to v6.17-rc3 with two commits pending to be merged upstream -- one for the same target spec format change [1] and another for the `file_as_c_str` change [2]. Link: rust-lang#144443 [1] Link: rust-lang#145928 [2] r? `@lqd` `@Kobzol` try-job: x86_64-rust-for-linux `@rustbot` label A-rust-for-linux `@bors` try
Zalathar
added a commit
to Zalathar/rust
that referenced
this pull request
Sep 3, 2025
CI: rfl: move job forward to Linux v6.17-rc3 plus 2 commits This upgrades the Rust CI from v6.16-rc1 plus a temporary commit for the >= 1.91 target spec [1] to v6.17-rc3 with two commits pending to be merged upstream -- one for the same target spec format change [1] and another for the `file_as_c_str` change [2]. Link: rust-lang#144443 [1] Link: rust-lang#145928 [2] r? ``@lqd`` ``@Kobzol`` try-job: x86_64-rust-for-linux ``@rustbot`` label A-rust-for-linux ``@bors`` try
phil-opp
added a commit
to rust-osdev/bootloader
that referenced
this pull request
Sep 3, 2025
This was referenced Sep 3, 2025
rust-timer
added a commit
that referenced
this pull request
Sep 3, 2025
Rollup merge of #146154 - ojeda:rfl, r=lqd CI: rfl: move job forward to Linux v6.17-rc3 plus 2 commits This upgrades the Rust CI from v6.16-rc1 plus a temporary commit for the >= 1.91 target spec [1] to v6.17-rc3 with two commits pending to be merged upstream -- one for the same target spec format change [1] and another for the `file_as_c_str` change [2]. Link: #144443 [1] Link: #145928 [2] r? ``@lqd`` ``@Kobzol`` try-job: x86_64-rust-for-linux ``@rustbot`` label A-rust-for-linux ``@bors`` try
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.
r? Noratrieb
cc @RalfJung (https://github.com/rust-lang/rust/pull/142352/files#r2230380120)
try-job: x86_64-rust-for-linux