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

@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
@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
phil-opp added a commit to rust-osdev/bootloader that referenced this pull request Sep 2, 2025
@phil-opp
Fix: target-pointer-width field now expects an integer
3addee3 
See rust-lang/rust#144443
@phil-opp phil-opp mentioned this pull request Sep 2, 2025
Merged
ojeda added a commit to ojeda/rust that referenced this pull request Sep 3, 2025
@ojeda
CI: rfl: upgrade to v6.17-rc3 plus 2 temporary commits
c56bf07 
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 <[email protected]>
ojeda added a commit to ojeda/rust that referenced this pull request Sep 3, 2025
@ojeda
CI: rfl: move job forward to Linux v6.17-rc3 plus 2 commits
7ce9d27 
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 <[email protected]>
@ojeda ojeda mentioned this pull request Sep 3, 2025
Merged
ojeda added a commit to ojeda/rust that referenced this pull request Sep 3, 2025
@ojeda
CI: rfl: move job forward to Linux v6.17-rc3 plus 2 commits
03bffa8 
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 <[email protected]>
Zalathar added a commit to Zalathar/rust that referenced this pull request Sep 3, 2025
@Zalathar
Rollup merge of rust-lang#146154 - ojeda:rfl, r=lqd
546c8b2 
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
@Zalathar
Rollup merge of rust-lang#146154 - ojeda:rfl, r=lqd
263048d 
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
@phil-opp
Fix(v0.9): target-pointer-width field now expects an integer
8fd07ad 
See rust-lang/rust#144443
This was referenced Sep 3, 2025
Merged
Merged
rust-timer added a commit that referenced this pull request Sep 3, 2025
@rust-timer
Unrolled build for #146154
dc1c42b 
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
github-actions bot pushed a commit to joseflrs/a4 that referenced this pull request Sep 7, 2025
@ojeda @gregkh
rust: support Rust >= 1.91.0 target spec
a86ad6a 
commit 8851e27 upstream.

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]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
github-actions bot pushed a commit to joseflrs/a4 that referenced this pull request Sep 7, 2025
@ojeda @gregkh
rust: support Rust >= 1.91.0 target spec
9b34a2c 
commit 8851e27 upstream.

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]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
github-actions bot pushed a commit to joseflrs/a4 that referenced this pull request Sep 7, 2025
@ojeda @gregkh
rust: support Rust >= 1.91.0 target spec
ed2afe1 
commit 8851e27 upstream.

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]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
github-actions bot pushed a commit to joseflrs/a4 that referenced this pull request Sep 7, 2025
@ojeda @gregkh
rust: support Rust >= 1.91.0 target spec
e07a343 
commit 8851e27 upstream.

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]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
github-actions bot pushed a commit to model-checking/verify-rust-std that referenced this pull request Sep 9, 2025
@matthiaskrgr
Rollup merge of rust-lang#144443 - WaffleLapkin:integer-target-pointe…
a469083 
…r-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
github-actions bot pushed a commit to sirdarckcat/linux-1 that referenced this pull request Sep 9, 2025
@ojeda @gregkh
rust: support Rust >= 1.91.0 target spec
17cab7b 
commit 8851e27 upstream.

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]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
Whissi pushed a commit to Whissi/linux-stable that referenced this pull request Sep 9, 2025
@ojeda @gregkh
rust: support Rust >= 1.91.0 target spec
d4797bd 
commit 8851e27 upstream.

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]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
opsiff pushed a commit to opsiff/UOS-kernel that referenced this pull request Sep 10, 2025
@ojeda @opsiff
rust: support Rust >= 1.91.0 target spec
a73f5d4 
commit 8851e27d2cb947ea8bbbe8e812068f7bf5cbd00b upstream.

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]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
(cherry picked from commit 17cab7b45f4db7fcc59420407e49ed66494a556c)
MatthewCroughan pushed a commit to MatthewCroughan/linux that referenced this pull request Sep 10, 2025
@ojeda @MatthewCroughan
rust: support Rust >= 1.91.0 target spec
f2420d4 
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]>
cmichi added a commit to use-ink/cargo-contract that referenced this pull request Sep 11, 2025
@cmichi
Handle Rust >= 1.91 change to target-pointer-width JSON type
6cf90d2 
rust-lang/rust#144443
cmichi added a commit to use-ink/cargo-contract that referenced this pull request Sep 11, 2025
@cmichi
Handle Rust >= 1.91 change to target-pointer-width JSON type
760ebff 
rust-lang/rust#144443
@cmichi cmichi mentioned this pull request Sep 11, 2025
Merged
cmichi added a commit to use-ink/cargo-contract that referenced this pull request Sep 12, 2025
@cmichi
Handle Rust >= 1.91 change of target-pointer-width JSON type (#2131)
758953d 
* Handle Rust >= 1.91 change to `target-pointer-width` JSON type

rust-lang/rust#144443

* Update changelog
opsiff pushed a commit to opsiff/UOS-kernel that referenced this pull request Sep 15, 2025
@ojeda @opsiff
rust: support Rust >= 1.91.0 target spec
54e2c50 
commit 8851e27d2cb947ea8bbbe8e812068f7bf5cbd00b upstream.

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]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
(cherry picked from commit 17cab7b45f4db7fcc59420407e49ed66494a556c)
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.