-
Notifications
You must be signed in to change notification settings - Fork 13.6k
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
base: master
Are you sure you want to change the base?
Make target pointer width in target json an integer #144443
Conversation
|
This PR modifies cc @jieyouxu These commits modify compiler targets. 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) |
We already did that with #144443... the current state is just inconsistent. But, no strong opinion. |
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.
283f21b
to
267f0bd
Compare
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
Uh, but then why did Miri CI only start failing today? Something changed in 9748d87...b56aaec. |
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;
}
|
This comment has been minimized.
This comment has been minimized.
Well if nothing else we found a bunch of bootstrap/compiletest staging bugs. 😿 |
This comment has been minimized.
This comment has been minimized.
💔 Test failed (CI). Failed jobs:
|
For "stage 1" ui-fulldeps, use the stage 1 compiler to query target info Testing ui-fulldeps in "stage 1" actually uses the stage 0 compiler, so that test programs can link against stage 1 rustc crates. Unfortunately, using the stage 0 compiler causes problems when compiletest tries to obtain target information from the compiler, but the output format has changed since the last bootstrap beta bump. We can work around this by also providing compiletest with a stage 1 compiler, and having it use that compiler to query for target information. --- This fixes the stage 1 ui-fulldeps failure seen at rust-lang#144443 (comment).
Rollup merge of #144848 - Zalathar:ui-fulldeps, r=clubby789 For "stage 1" ui-fulldeps, use the stage 1 compiler to query target info Testing ui-fulldeps in "stage 1" actually uses the stage 0 compiler, so that test programs can link against stage 1 rustc crates. Unfortunately, using the stage 0 compiler causes problems when compiletest tries to obtain target information from the compiler, but the output format has changed since the last bootstrap beta bump. We can work around this by also providing compiletest with a stage 1 compiler, and having it use that compiler to query for target information. --- This fixes the stage 1 ui-fulldeps failure seen at #144443 (comment).
For "stage 1" ui-fulldeps, use the stage 1 compiler to query target info Testing ui-fulldeps in "stage 1" actually uses the stage 0 compiler, so that test programs can link against stage 1 rustc crates. Unfortunately, using the stage 0 compiler causes problems when compiletest tries to obtain target information from the compiler, but the output format has changed since the last bootstrap beta bump. We can work around this by also providing compiletest with a stage 1 compiler, and having it use that compiler to query for target information. --- This fixes the stage 1 ui-fulldeps failure seen at rust-lang/rust#144443 (comment).
ffe4f0c
to
1a5b2b0
Compare
1a5b2b0
to
c4ca575
Compare
…<try> Make target pointer width in target json an integer try-job: x86_64-gnu-llvm-19-3
@bors r=Noratrieb |
…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)
…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)
Rollup of 16 pull requests Successful merges: - #143857 (Port #[macro_export] to the new attribute parsing infrastructure) - #144133 (Stabilize const TypeId::of) - #144369 (Upgrade semicolon_in_expressions_from_macros from warn to deny) - #144443 (Make target pointer width in target json an integer) - #144473 (Address libunwind.a inconsistency issues in the bootstrap program) - #144659 (bootstrap: refactor mingw dist and fix gnullvm) - #144682 (Stabilize `strict_overflow_ops`) - #144794 (Port `#[coroutine]` to the new attribute system) - #144835 (Anonymize binders in tail call sig) - #144836 (Change visibility of Args new function) - #144900 (Stabilize `unsigned_signed_diff` feature) - #144903 (Rename `begin_panic_handler` to `panic_handler`) - #144910 (Add regression tests for seemingly fixed issues) - #144926 (Correct the use of `must_use` on btree::IterMut) - #144928 (Drop `rust-version` from `rustc_thread_pool`) - #144931 ([win][arm64ec] Fix msvc-wholearchive for Arm64EC) Failed merges: - #144914 (Add support for `ty::Instance` path shortening in diagnostics) r? `@ghost` `@rustbot` modify labels: rollup
Most likely failed in #144942 (comment). @bors r- |
Looks like cargo's tests are asserting on the text emitted by EDIT: Given that cfg values must be strings, this seems like an actual unintended breakage that was not caught by rustc tests, but was caught by cargo tests. |
r? Noratrieb
cc @RalfJung (https://github.com/rust-lang/rust/pull/142352/files#r2230380120)