Make target pointer width in target json an integer

[WaffleLapkin]

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

[rustbot]

Noratrieb is not on the review rotation at the moment.
They may take a while to respond.

[rustbot]

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]

I'm unsure if it's worth breaking everyone over such a minor improvement.. maybe? maybe not?

[Noratrieb]

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]

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]

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

[RalfJung]

@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.

[RalfJung]

The breaking change was probably #144218.

[WaffleLapkin]

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]

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

[WaffleLapkin]

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.

[bors]

☔ The latest upstream changes (presumably #144740) made this pull request unmergeable. Please resolve the merge conflicts.

[WaffleLapkin]

@Noratrieb I think this is ready for review :3

[Noratrieb]

@bors r+

[bors]

📌 Commit ffe4f0c has been approved by Noratrieb

It is now in the queue for this repository.

[Zalathar]

Failed in rollup: #144845 (comment)

@bors r-

[Zalathar]

@bors try jobs=x86_64-gnu-llvm-19-3

[rust-bors]

⌛ Trying commit ffe4f0c with merge c576725…

To cancel the try build, run the command @bors try cancel.

[Zalathar]

I'm unsure if it's worth breaking everyone over such a minor improvement.. maybe? maybe not?

Well if nothing else we found a bunch of bootstrap/compiletest staging bugs. 😿

[rust-log-analyzer]

The job x86_64-gnu-llvm-19-3 failed! Check out the build log: (web) (plain enhanced) (plain)

Click to see the possible cause of the failure (guessed by this bot)

[TIMING] core::build_steps::test::RemoteCopyLibs { compiler: Compiler { stage: 0, host: x86_64-unknown-linux-gnu, forced_compiler: false }, target: x86_64-unknown-linux-gnu } -- 0.000
##[group]Testing stage0 compiletest suite=ui-fulldeps mode=ui (x86_64-unknown-linux-gnu)

thread 'main' panicked at src/tools/compiletest/src/common.rs:924:10:
called `Result::unwrap()` on an `Err` value: Error("invalid type: string \"64\", expected u32", line: 60, column: 32)
stack backtrace:
   0: __rustc::rust_begin_unwind
             at /rustc/390a0ab5dc4a895235a551e502c3893c3337731d/library/std/src/panicking.rs:697:5
   1: core::panicking::panic_fmt
             at /rustc/390a0ab5dc4a895235a551e502c3893c3337731d/library/core/src/panicking.rs:75:14
   2: core::result::unwrap_failed
             at /rustc/390a0ab5dc4a895235a551e502c3893c3337731d/library/core/src/result.rs:1761:5
   3: <compiletest::common::TargetCfgs>::new
   4: <std::sync::poison::once::Once>::call_once_force::<<std::sync::once_lock::OnceLock<compiletest::common::TargetCfgs>>::initialize<<std::sync::once_lock::OnceLock<compiletest::common::TargetCfgs>>::get_or_init<<compiletest::common::Config>::target_cfgs::{closure#0}>::{closure#0}, !>::{closure#0}>::{closure#0}
   5: std::sys::sync::once::futex::Once::call
             at /rustc/390a0ab5dc4a895235a551e502c3893c3337731d/library/std/src/sys/sync/once/futex.rs:176:21
   6: <std::sync::once_lock::OnceLock<compiletest::common::TargetCfgs>>::initialize::<<std::sync::once_lock::OnceLock<compiletest::common::TargetCfgs>>::get_or_init<<compiletest::common::Config>::target_cfgs::{closure#0}>::{closure#0}, !>
   7: <compiletest::directives::needs::CachedNeedsConditions>::load
   8: compiletest::run_tests
note: Some details are omitted, run with `RUST_BACKTRACE=full` for a verbose backtrace.
Build completed unsuccessfully in 0:29:48
  local time: Sun Aug  3 05:22:22 UTC 2025
  network time: Sun, 03 Aug 2025 05:22:22 GMT

[rust-bors]

💔 Test failed (CI). Failed jobs:

• bors build finished (web logs, extended logs)
• try - x86_64-gnu-llvm-19-3 (web logs, extended logs)