Upgrade Rust toolchain to nightly-2026-07-01 - #4764
Draft
feliperodri wants to merge 2 commits into
Draft
Conversation
Four upstream changes drive most of this. **Retag moved onto `Rvalue::Use`.** `StatementKind::Retag` and `RetagKind` are gone; `Rvalue::Use` now carries a `WithRetag` flag instead. Kani never modelled retags (they are Stacked-Borrows/Miri only), so the statement arms are dropped, the flag is ignored when reading a `Use`, and synthesized `Use`s pass `WithRetag::No`. `internal_mir`'s `RetagKind` conversion becomes a `WithRetag` one. **`Variants::Multiple` stores a `VariantLayout`, not a `LayoutData`.** The new type carries only per-field offsets -- no `FieldsShape` (so no field order) and no alignment. Variant layouts now come from `Layout::for_variant`, which is what `rustc_codegen_ssa` does and restores the field order; a new `variant_layout` helper is used by both the type side (`codegen_enum_cases`) and the value side (`codegen_aggregate`) so the goto struct's components and the operands initializing them cannot disagree. `for_variant` reports the *enum's* align for a variant (`align: parent.align`), which would over-pad every variant and inflate the enum -- caught by `check_vtable_size` on `tests/cargo-kani/iss2857` (48 vs 55 bytes). So `codegen_struct_fields`/`codegen_alignment_padding` now take the align explicitly, and a variant's own align is computed as the maximum of its fields' aligns, which is what the per-variant `LayoutData` used to carry. **`rustc_layout_scalar_valid_range_start`/`_end` were removed** in favour of pattern types, the same move `core::num::niche_types` made. The tests that define ranged scalar newtypes are converted to `std::pat::pattern_type!`. Note the consequence for autoharness: a pattern type is not an ADT and has no `Arbitrary` implementation, so `can_derive_arbitrary` cannot synthesize a struct that has one as a field, and locally-defined ranged types are now skipped rather than harnessed. The niche assumption added in model-checking#4716 is still exercised end to end through `std::time::Duration`; `tests/script-based-pre/autoharness_niche` pins both halves so the reduced reach is asserted rather than silent. **New `Rvalue::Reborrow`** (user-definable reborrowing of ADTs via `CoerceShared`). It is documented as a bitwise copy today, but the same docs anticipate it changing memory layout, so codegen reports it as an unsupported construct rather than silently modelling it as a copy. The points-to analysis treats it as pointing wherever its place does. Also adapts to: the `CodegenBackend` trait moving `CrateInfo` from `codegen_crate` to `join_codegen` (both backends), `rustc_data_structures:: stable_hasher` being renamed to `stable_hash` with `HashStable`/`hash_stable` becoming `StableHash`/`stable_hash`, the `normalize` callback of `ptr_metadata_ty{,_or_tail}` now taking `Unnormalized`, more `FieldDef::ty` and `instantiate*` sites needing `.skip_normalization()`, `TagEncoding::Niche`'s `niche_variants` becoming the lang `RangeInclusive` (public `start`/`last` fields), and the new `useless_borrows_in_formatting` clippy lint. The `vtable_size_align_drop` test no longer asserts the exact identity of the vtable's drop pointer: the drop-glue shim is now `core::ptr::drop_glue::<T>` rather than `core::ptr::drop_in_place::<T>`, and `drop_glue` is not nameable from source. It checks the slot is populated instead; the size and align fields that the test is named for are unchanged.
A much smaller upgrade than the previous two: no verification behaviour changed, and no test needed adjusting. **`FieldDef` moved to the `crate_def_with_ty!` macro.** Its inherent `ty()` and `ty_with_args()` are now provided by the `CrateDefType` trait, so the 17 call sites just need that trait in scope. This is a pure import change -- the semantics are identical (both still resolve to `def_ty`/`def_ty_with_args`). **`EarlyBinder::bind` takes the interner.** `bind(value)` becomes `bind(tcx, value)` at five sites. **`Terminator` gained MIR-level attributes** (`attributes: ThinVec<AttributeKind>`). The stable representation has no equivalent, and Kani-synthesized terminators carry none, so `internal_mir` passes an empty vector. **`TerminatorKind::Drop` lost `async_fut`**, so that field is dropped from the `internal_mir` conversion. **Work products are an `UnordMap`, not an `FxIndexMap`**, in `CodegenBackend::join_codegen`'s return type (both backends). Full regression run is clean on the first attempt: kani 607/607, cargo-kani 71/71, expected, script-based-pre 68/68, std-checks, cargo-ui, coverage, prusti, smack, kani-docs, json-handler, cargo-coverage, all unit tests, both `-D warnings` clippy gates, the `-D warnings` build, fmt, and the LLBC build.
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
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.
Important
Draft: do not review until #4760 (
nightly-2026-06-01) is merged.This branch is stacked on #4760, so its diff currently contains that commit too. Once #4760 lands this rebases down to the single
nightly-2026-07-01commit. Review only the last commit.Description
Bumps
rust-toolchain.tomlfromnightly-2026-06-01tonightly-2026-07-01.A much smaller upgrade than the previous two (25 compile errors vs. 66 for 06-01): no verification behaviour changed and no test needed adjusting. Every change is a mechanical adaptation to a moved or renamed API.
1.
FieldDefmoved to thecrate_def_with_ty!macroty()andty_with_args()are no longer inherent methods; they come from theCrateDefTypetrait, which the macro implements. The 17 call sites across 10 files therefore only need that trait in scope. The semantics are identical — both the old inherent methods and the trait defaults resolve todef_ty/def_ty_with_args— so this is a pure import change.Imports were added per file to match each file's existing
use rustc_public::..style. Worth noting for future upgrades: as morerustc_publictypes migrate onto these macros, this particular adaptation is likely to recur, so a shared import point may eventually be worth it.2.
EarlyBinder::bindtakes the internerEarlyBinder::bind(value)becomesEarlyBinder::bind(tcx, value)— five sites instubbing/mod.rs,transform/mod.rsandcodegen/typ.rs.3.
Terminatorgained MIR-level attributesThe stable (
rustc_public) representation has no equivalent, and terminators Kani synthesizes carry none, so theinternal_mirconversion passes an empty vector.4.
TerminatorKind::Droplostasync_futThat field is dropped from the
internal_mirconversion.5. Work products are an
UnordMapCodegenBackend::join_codegen's return type changed fromFxIndexMap<WorkProductId, WorkProduct>toUnordMap<..>. Updated in both backends, including thedowncasttarget and the empty map each returns.Testing
Local, macOS aarch64, CBMC 6.10.0 (
cbmc-6.9.0-214-g45436eea34). Clean on the first attempt — no test changes were needed:kanicargo-kaniscript-based-prestd-checkscargo-uicoverageprusti/smack/kani-docs/json-handler/cargo-coverage/firecrackeruicadicaltests, see belowOther gates, all clean:
cargo build-devcargo build-dev -- --features cprover --features llbccargo clippy --workspace --tests -- -D warningsandRUSTFLAGS="--cfg=kani_sysroot" cargo clippy --workspace -- -D warningsRUSTFLAGS="-D warnings" cargo build --no-default-features --features cprover./scripts/kani-fmt.sh --checkcprover_bindings,kani-compiler,kani-driver,kani_metadata,kani --features concrete_playback,kani_macrosEnvironment caveat: this CBMC build has no
cadical, soui/solver-{attribute,option}/cadicalfail locally on output text only ("The specified solver, 'cadical', is not available"). Both are expected to be clean on CI.By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 and MIT licenses.