Skip to content

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.

Sign up for GitHub

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

Jump to bottom
Merged
merged 5 commits into from
Aug 31, 2025
Merged

Make target pointer width in target json an integer #144443

merged 5 commits into from
Aug 31, 2025

Conversation

WaffleLapkin
Copy link
Member

@WaffleLapkin WaffleLapkin commented Jul 25, 2025 •
edited
Loading

r? Noratrieb
cc @RalfJung (https://github.com/rust-lang/rust/pull/142352/files#r2230380120)

try-job: x86_64-rust-for-linux

@rustbot
Copy link
Collaborator

rustbot commented Jul 25, 2025

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
@rustbot
Copy link
Collaborator

rustbot commented 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

Noratrieb
Noratrieb reviewed Jul 25, 2025
View reviewed changes
Copy link
Member

@Noratrieb Noratrieb left a 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?

@rust-log-analyzer

This comment has been minimized.

Sign in to view
@Noratrieb
Copy link
Member

Noratrieb commented Jul 25, 2025 •
edited
Loading

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)

@RalfJung
Copy link
Member

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 bb5b5c5 to 283f21b Compare July 25, 2025 11:55
@WaffleLapkin
Copy link
Member Author

@Noratrieb what's the other breaking change? #142352 has been merged for over a month..

@rust-log-analyzer

This comment has been minimized.

Sign in to view
@WaffleLapkin WaffleLapkin force-pushed the integer-target-pointer-width branch from 283f21b to 267f0bd Compare July 25, 2025 12:35
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@RalfJung
Copy link
Member

RalfJung commented Jul 25, 2025 •
edited
Loading

@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 b64ab4a to b2871e5 Compare July 25, 2025 13:33
@RalfJung
Copy link
Member

RalfJung commented Jul 25, 2025 •
edited
Loading

The breaking change was probably #144218.

RalfJung
RalfJung reviewed Jul 25, 2025
View reviewed changes
@WaffleLapkin
Copy link
Member Author

The only relevant change I see is #144218, but that doesn't explain anything, it should have been failing with #142352, I don't see how it could have accepted c-int-width being a string...

@RalfJung
Copy link
Member

It might be that the field of wrong type just got ignored, which is exactly why Nora ported this to serde.

@WaffleLapkin
Copy link
Member Author

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.

RalfJung
RalfJung reviewed Jul 25, 2025
View reviewed changes
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@jieyouxu jieyouxu self-assigned this Jul 25, 2025
@jieyouxu jieyouxu mentioned this pull request Jul 28, 2025
Closed
@rustbot

This comment has been minimized.

Sign in to view
@ojeda
Copy link
Contributor

ojeda commented Aug 23, 2025

@ojeda thanks for a timely fix!

You're welcome! I will get the ball rolling on the kernel side then.

This was referenced Aug 23, 2025
Merged
Open
github-merge-queue bot pushed a commit to rust-lang/cargo that referenced this pull request Aug 25, 2025
@epage
test: avoid hardcoded target spec json (#15880)
7f76234 
Read a real target spec JSON so we no longer need to hardcode
a target spec JSON here.
Cargo itself should not care about the spec schema.

Let's stop bothering compiler contributors.

* rust-lang/rust#144443
* rust-lang/rust#145764 (comment)
* [#t-compiler > Is it possible to add a commit to a submodule? @
💬](https://rust-lang.zulipchat.com/#narrow/channel/131828-t-compiler/topic/Is.20it.20possible.20to.20add.20a.20commit.20to.20a.20submodule.3F/near/535865215)
github-merge-queue bot pushed a commit to rust-lang/cargo that referenced this pull request Aug 26, 2025
@weihanglo
test: avoid hardcoded target spec json (#15880)
a6c58d4 
Read a real target spec JSON so we no longer need to hardcode
a target spec JSON here.
Cargo itself should not care about the spec schema.

Let's stop bothering compiler contributors.

* rust-lang/rust#144443
* rust-lang/rust#145764 (comment)
* [#t-compiler > Is it possible to add a commit to a submodule? @
💬](https://rust-lang.zulipchat.com/#narrow/channel/131828-t-compiler/topic/Is.20it.20possible.20to.20add.20a.20commit.20to.20a.20submodule.3F/near/535865215)
@weihanglo
Copy link
Member

Blocked on #145909.

@WaffleLapkin WaffleLapkin force-pushed the integer-target-pointer-width branch from fe01e35 to 2d8cb59 Compare August 27, 2025 21:49
@rustbot
Copy link
Collaborator

rustbot commented Aug 27, 2025

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.

@WaffleLapkin
Copy link
Member Author

#145909 got merged, so this should be good to go. I can't imagine what else can break ^^'

@ojeda
Copy link
Contributor

ojeda commented Aug 29, 2025

@WaffleLapkin It seems to be on S-waiting-on-author

@WaffleLapkin
Copy link
Member Author

@bors r=Noratrieb

@bors
Copy link
Collaborator

bors commented Aug 31, 2025

📌 Commit 2d8cb59 has been approved by Noratrieb

It is now in the queue for this repository.

@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
@matthiaskrgr matthiaskrgr mentioned this pull request Aug 31, 2025
Merged
bors added a commit that referenced this pull request Aug 31, 2025
@bors
Auto merge of #146052 - matthiaskrgr:rollup-cfxx9m6, r=matthiaskrgr
564ee21 
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
@bors bors merged commit 0e28b42 into rust-lang:master Aug 31, 2025
10 checks passed
@rustbot rustbot added this to the 1.91.0 milestone Aug 31, 2025
rust-timer added a commit that referenced this pull request Aug 31, 2025
@rust-timer
Unrolled build for #144443
45166c0 
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
@WaffleLapkin WaffleLapkin deleted the integer-target-pointer-width branch August 31, 2025 16:20
@WaffleLapkin
Copy link
Member Author

yay :3

ojeda added a commit to Rust-for-Linux/linux that referenced this pull request Aug 31, 2025
@ojeda
rust: support Rust >= 1.91.0 target spec
8851e27 
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 <[email protected]>
Link: rust-lang/rust#144443 [1]
Link: https://lore.kernel.org/r/[email protected]
Signed-off-by: Miguel Ojeda <[email protected]>
github-actions bot pushed a commit to rust-lang/compiler-builtins that referenced this pull request Sep 1, 2025
@bors
Auto merge of #146052 - matthiaskrgr:rollup-cfxx9m6, r=matthiaskrgr
c8285db 
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
@bors
Auto merge of #146052 - matthiaskrgr:rollup-cfxx9m6, r=matthiaskrgr
2dea859 
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
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@RalfJung RalfJung RalfJung left review comments

@jieyouxu jieyouxu jieyouxu left review comments

@Noratrieb Noratrieb Noratrieb left review comments

Assignees

@Noratrieb Noratrieb

Labels
A-CI Area: Our Github Actions CI A-compiler-builtins Area: compiler-builtins (https://github.com/rust-lang/compiler-builtins) A-compiletest Area: The compiletest test runner A-run-make Area: port run-make Makefiles to rmake.rs A-rust-for-linux Relevant for the Rust-for-Linux project A-testsuite Area: The testsuite used to check the correctness of rustc S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. 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. T-infra Relevant to the infrastructure team, which will review and decide on the PR/issue.
Projects
None yet
Milestone
1.91.0
Development

Successfully merging this pull request may close these issues.