Repository navigation
rust 1.99.1 -> 1.100.0 on a gen-16 rustc-1.99.1 stage0 (LLVM 23); drops bun's 1.99 shims - #1493
bryan-minimal wants to merge 12 commits into
Conversation
Thin prebuilt of bootstrap's rustc-1.99.1 rung, built against llvm-23, the same shape as rustc-1.98.1. gen-16 is not published yet: both sha256s are all-zero placeholders marked TODO(gen-16). runtime_deps pin llvm-23 so the next default-LLVM major does not move the rung. Carries the `# pkgmgr: bootstrap_rung = "rust"` marker. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
- stage0 import, STAGE0_PREFIX and version check -> rustc-1.99.1 - drop LD_LIBRARY_PATH=/usr/lib/llvm-21/lib: the stage0 now needs libLLVM.so.23.1, which the default llvm (23.1.5) provides in /usr/lib - bootstrap.toml change-id 154587 -> 162423 (1.100.0's newest entry); every key used still exists in 1.100's config/toml/*.rs - source sha256 = static.rust-lang.org's rustc-1.100.0-src.tar.xz.sha256 - amaro-wasm: rustc pin and the matching rustc source tarball Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Cargo 1.100 switched the build-dir to a per-unit layout: target/<triple>/release/deps/ no longer exists and build-script OUT_DIRs moved to build/<pkg>/<hash>/out. Cargo's changelog says tools should read its JSON messages instead of the layout, so: - rust-arm-embedded takes the -Zbuild-std rlibs from compiler-artifact "filenames" (only paths under the target's triple dir), and fails if core, alloc or compiler_builtins is missing - broot takes its build script's out_dir from build-script-executed and fails instead of silently skipping the declared completions Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
|
Warning Review limit reached
This review includes 12 billable files and costs up to $3.00.
Reviews can continue after your included limit without a manual trigger. An admin must approve usage-based billing. Or wait 5 minutes for your next included review. View limit details
No actionable comments were generated in the recent review. Walkthrough
Merge Risk:
|
bun 1.4.4 (#1492) carried rust-1.99-type-info-of.patch so it would compile on rustc 1.99.1: a local core::mem::type_info::of in bun_collections and a hand-written `impl Default for Start` in lint_js.rs. Both APIs are in 1.100.0 (type_info::of under the type_info feature, `impl Default for Once` stable as once_default), so upstream's source compiles as written. Remove the patch, its build.ncl Local entry, the patch/apply guards, and the guard that failed on rustc >= 1.100. In its place build.sh requires rustc >= 1.100, since bun 1.4.3+ now needs it. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
amd64 02a0a9c8..., arm64 07b2fdce..., both compared clean across two lab machines per arch. The arm64 object name carries the version (rustc-1.99.1-1.99.1-aarch64.tar.zst), unlike gen-13's rustc-1.98.1-aarch64, so the placeholder name is fixed too. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
pkgs builds libssh2 from the GitHub tag archive, whose include/libssh2.h says LIBSSH2_VERSION "1.11.1_DEV" (release tarballs stamp the suffix out). CMake copies it into libssh2.pc, libssh2_version() returns it, and the SSH banner sends "SSH-2.0-libssh2_1.11.1_DEV". rust 1.100's cargo vendors libssh2-sys 0.3.4, whose build.rs semver-parses the pkg-config version and panics on `_DEV`. That is the #1493 failure on both arches, found by minimermetic-7f. build.sh now stamps the release version into the header after the CVE patches (none of which touch it), checks the header, and checks that the installed libssh2.pc says `Version: <version>`. Both checks fail on unstamped input. The version comes in as a build arg so the stamp follows bumps. Only rust and rustc-1.98.1 import libssh2. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Rust 1.100 stabilized part of allocator_api and moved the rest to allocator_ext. bun 1.4.4 (and bun main) pin nightly-2026-09-15, from before the split, so 11 bun crates still enable allocator_api. On 1.100 that is `-D stable-features` and no longer unlocks Vec::new_in as a const fn, which failed bun_alloc in #1493's amd64 build. build.sh renames the gate in every crate root that enables it (bundler and shell_parser list it with other features), then fails if any is left. Tested on the 1.4.4 tag's 11 crate roots: all 11 found before and none after, only those lines change, and `allocator_api2::` is untouched. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
…the gate 1826e84 renamed allocator_api to allocator_ext. On #1493's next build that failed three ways: bun_ptr and bun_shell_parser only use the part 1.100 stabilized, so a lone allocator_ext is unused (-D unused-features); and bun_collections lists the gate across lines, which the one-line pattern missed. build.sh now leaves bun's gates alone and puts #![feature(allocator_ext)] #![allow(stable_features, unused_features)] at the top of every crate root (a file with `#![feature`) that enables allocator_api in any form, then checks each starts with both lines. Tested on all 124 crate roots of the 1.4.4 tag: the 12 that enable it (collections included) gain exactly those two lines, a decoy using `allocator_api2::` is untouched, and the check fails when a file is left unpatched. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
norrietaylor
left a comment
There was a problem hiding this comment.
Scope. The diff matches the title and the PR body. It has the rung, the 1.100.0 bump, the amaro-wasm pin, three cargo build-dir fixes (rust-arm-embedded, broot, bun), and the libssh2 version stamp. Each hunk traces to a break that the PR body names. Clobber. None found. git log on bun, libssh2, broot and rust-arm-embedded shows only this branch's own commits on top of main.
Correctness.
rustc-1.99.1differs fromrustc-1.98.1only in the gen, the shas, the version andllvm-21->llvm-23.- The removal of
LD_LIBRARY_PATHis sound.rustkeeps the defaultllvm(23.1.5) inruntime_deps, so/usr/lib/libLLVM.so.23.1is in the build sandbox.llvm-23is also 23.1.5. - No other package pins rustc 1.99 except
verus-latest, which is its own toolchain. - No other build script reads the old
target/<triple>/release/depslayout.charonalready searches both the target dir and the build dir, andbatpins its own assets dir. - The bun allocator prepend puts inner attributes before other inner attributes and
//!docs, which is valid. With no input files,xargs grepreads/dev/null, so it does not hang. - One nit is filed on the libssh2 fallback default.
Not checked. No compile, by policy. The broot package_id match and the rust-arm-embedded */<triple>/release/* filter were read against cargo's documented JSON shape, not against real output. The PR reports a green build on both arches at this head. The rung's DT_NEEDED TODO stays open, as the PR says.
| echo "ERROR: include/libssh2.h LIBSSH2_VERSION is not \"${MINIMAL_ARG_VERSION:-1.11.1}\"" >&2 | ||
| grep -n '^#define LIBSSH2_VERSION ' include/libssh2.h >&2 | ||
| exit 1 | ||
| } |
There was a problem hiding this comment.
nit · build.ncl now always passes version through build_args, so the ${MINIMAL_ARG_VERSION:-1.11.1} fallback (five occurrences) is dead code that hardcodes the version a second time. Use $MINIMAL_ARG_VERSION directly, as other packages do. With set -u, a missing build arg then fails at once and does not compare against a stale literal.
Co-Authored-By: Claude Fable 5.2 <noreply@anthropic.com>
Builds on both arches. build-bot run at
95028ed7passedminimal buildon amd64 and arm64 (68 min, 2026-11-14), with every check green. Its stage0,rustc-1.99.1, is bootstrap generation gen-16 (gominimal/bootstrap#13, built on LLVM 23). The first real builds found two breaks this PR now fixes: libssh2's version string, and bun'sallocator_apigate. Both are under Changes.Changes
packages/rustc-1.99.1/build.ncl(new). A thin prebuilt that pulls the gen-16 rung tarballs. It is shaped likerustc-1.98.1(gen-13) and installs at/usr/lib/rustc-1.99.1.runtime_depspinsllvm-23, not the defaultllvm, so the next default-LLVM major does not move this frozen rung.# pkgmgr: bootstrap_rung = "rust".02a0a9c8…, arm6407b2fdce…(rustc-1.99.1-1.99.1-aarch64.tar.zst).DT_NEEDED.packages/rust: 1.99.1 -> 1.100.0.90dab90b8084eb57c35ae2b1d0b70c8e5138ace6023b22c60a5a400f586f63b2, which equals static.rust-lang.org'srustc-1.100.0-src.tar.xz.sha256.STAGE0_PREFIXand the--versiongrep now point at rustc-1.99.1. 1.100.0'ssrc/stage0pins 1.99.0, and x.py compares major.minor only.export LD_LIBRARY_PATH=/usr/lib/llvm-21/lib. The new stage0 needslibLLVM.so.23.1, and the default llvm (23.1.5 since llvm: freeze LLVM 21 as llvm-21, switch default llvm to 23.1.5 (LLVM plan steps 6+7) #1339) already provides that in/usr/lib. Exporting/usr/lib/llvm-23/libinstead would make the stage1/stage2 compilers load the prefixed copy under the same soname. The comment says to re-add it once the default llvm moves past 23.rustnever had an llvm-21 build or runtime dep of its own; that dep lived only onrustc-1.98.1.bootstrap.toml:change-id = 162423, the newest entry in 1.100.0'schange_tracker.rs.packages/amaro-wasm. Itsrustcpin and the matchingrustc-<v>-src.tar.xzsha are bumped to 1.100.0 (same tarball). Without this its build.sh fails withrustc is not 1.99.1.packages/rust-arm-embedded/build.sh. It readtarget/<triple>/release/deps/lib*.rlib, which cargo 1.100 no longer produces. Its new default build-dir layout stores each unit underbuild/<pkg>/<hash>/out/(cargo#17354, #15010). Details are in the section below.packages/bun: Rust 1.99 shims removed. bun 1.4.4 (SECURITY: bun 1.3.14 -> 1.4.4 on llvm-23 (3 HIGH), with Rust 1.99 shims #1492, now merged into this branch) carried them to build on rustc 1.99.1, and they hard-failed on rustc >= 1.100.rust-1.99-type-info-of.patch(a localcore::mem::type_info::ofinbun_collections, plus a hand-writtenimpl Default for Startinlint_js.rsreplacing#[derive(Default)]).build.nclLocalentry and, inbuild.sh, the patch application, its three post-apply greps (including^impl Default for Start {$) and the guard that failed on rustc >= 1.100.build.shnow requires rustc >= 1.100. bun 1.4.3+ needs it.packages/libssh2: stamp the release version (7bd7eff). The source is GitHub's tag archive, whoseinclude/libssh2.hsaysLIBSSH2_VERSION "1.11.1_DEV"; release tarballs stamp the suffix out. CMake copied it intolibssh2.pc, and libssh2-sys 0.3.4 (cargo in 1.100) semver-parses the pkg-config version and panicked, which stopped cargo's build on both arches. The same string went intolibssh2_version()and the SSH banner (SSH-2.0-libssh2_1.11.1_DEV).build.shnow stamps the version (a build arg, so it follows bumps) after the CVE patches, and checks both the header and the installedlibssh2.pc. Only rust and rustc-1.98.1 import libssh2.packages/bun: Rust 1.100'sallocator_apisplit (95028ed). 1.100 stabilized part ofallocator_apiand moved the rest (e.g. constVec::new_in) toallocator_ext. bun 1.4.4 and bun main still pinnightly-2026-09-15, from before the split, so 12 bun crate roots enableallocator_api, which bun's-D warningsrejects. Crates differ on which part they need: a plain rename left bun_ptr and bun_shell_parser with an unusedallocator_ext. Sobuild.shleaves bun's gates alone and prepends#![feature(allocator_ext)]and#![allow(stable_features, unused_features)]to every crate root that enablesallocator_api(single-line, listed, or multi-line like bun_collections), then checks each one. Tested on all 124 crate roots of the 1.4.4 tag. bun upstream will need the same change once its pinned nightly moves.packages/broot/build.sh. It now takes its build script'sOUT_DIRfrom cargo'sbuild-script-executedmessage, instead of runningfindovertarget/release/build. It also fails loudly instead of silently skipping. The oldfind -path '*/out/broot.bash'would still have matched the newbuild/broot/<hash>/out, so this is hardening rather than a break. The skip was silent, though, while all three completions are declared outputs.rust-arm-embedded: why JSON messages
The
-Zbuild-stdrlibs (core, alloc, compiler_builtins, ...) are intermediate artifacts. They never reach the final artifact dir, which holds onlylibdriver.rlib, so "copy fromtarget/<triple>/release" is not an option.I considered two fixes:
src/workspace/features.rs) is the env var__CARGO_TEMPORARY_BUILD_DIR_NEW_LAYOUT_OPT_OUT=1. The name says it is temporary, so this would break again soon.The build now runs
cargo build ... --message-format=json-render-diagnostics. It then copies every.rlibnamed in acompiler-artifactmessage'sfilenamesthat sits under/<triple>/release/, which excludes host-built build scripts and deps, and it skips the driver. A positive control fails the build iflibcore-*,liballoc-*orlibcompiler_builtins-*is missing for any target. The same code works under the old and new layouts.Verified
minimal buildpassed on amd64 and arm64 at95028ed7. That covers every package changed here: rust (stage1/stage2 and cargo, on the gen-16 stage0), rustc-1.99.1, amaro-wasm, rust-arm-embedded (including its-Zbuild-stdrlib control), broot, libssh2 and bun..sha256. A.ascis published, and the signing key fingerprint is108F66205EAEB0AAA8DD5E1C85AB96E6FA1BE5FE.rust/bootstrap.tomluses still exists in 1.100.0'ssrc/bootstrap/src/core/config/toml/*.rs. The keys arevendor,build-stage/test-stage/doc-stage,extended,tools,docs,rustc,cargo,link-shared,channel,download-rustc,lld,llvm-bitcode-linker,remap-debuginfo,compression-profile,src-tarball,cc/cxx/linker/llvm-config/default-linkerandprefix.compiletest-use-stage0-libtest(unused here),rust.use-lld(we userust.lld, which still exists), and theoverride-allocatorrename (unused).x install srcbecamerust-src(162423). We install explicit components and copylibrary/by hand, andlibrary/std,compiler/rustc,cargo,clippy,rustfmtandrust-analyzerare all still valid install paths.vendor.rssed anchor (let _guard = builder.group(&format!("Vendoring sources) matches exactly once in 1.100.0.VendorOutput { config, config_library }is unchanged.check_llvm_versionin 1.100.0 needs LLVM >= 21, which 23.1.5 satisfies.3acc79c, 0.101.0) still honours__CARGO_TESTS_ONLY_SRC_ROOT, which amaro-wasm uses.38afee6c) as published usesuse core::mem::type_info;/type_info::of::<T>()insrc/collections/multi_array_list.rs(with#![feature(type_info)]) and#[derive(Default)]over astd::sync::Oncefield insrc/runtime/cli/lint_js.rs. Rust 1.100.0 has both:pub const fn of<T: ?Sized>() -> TypeIdinlibrary/core/src/mem/type_info.rs(unstabletype_info, which bun'sRUSTC_BOOTSTRAP=1allows) andimpl Default for Once, stable asonce_defaultsince 1.100.0. These are the only two places the patch touched.rustandrustc-1.99.1, the only1.99reference left isverus-latest'slet rust = "1.99.1". That is Verus's ownrust-toolchain.tomlchannel, vendored privately with rustc-dev and independent of therustpackage, so it stays as is.nickel formatwas run on every.nclchanged here.Not verified
will be rejected by a future version. build-bot only exports logs for failed builds, so this needs the run's log (see Review items).DT_NEEDEDset is still assumed from gen-13 (see the TODO inpackages/rustc-1.99.1/build.ncl). The gen-16 names and shas are now real.rustc-1.100.0-src.tar.xzis mirrored (2026-11-13, 263313328 bytes, sha25690dab90b…63b2read back from the public URL; signature and checksum verified before upload).History
gen-16 (gominimal/bootstrap#13, published and verified 123/123) supplies the stage0, and
rustc-1.100.0-src.tar.xzis mirrored. The first build-bot runs failed in cargo (libssh2_DEV), then in bun (allocator_api, twice); all three are fixed above.Mirror command, for the next rustc source (it verifies the signature and checksum, then makes a create-only upload). Two fixes against the first version of this command, which can't pass with sq 1.5:
sq inspect | grep -qdies with "Broken pipe", so the output is captured first.--policy-as-of 2023-01-01evaluates the key under the policy of that day; the signature over the tarball is checked as usual.It fails if
sqis missing rather than skipping the signature.Review items
!on all editions, andInfallibleis now an alias of!(rust#155499). This is the main crate-level unknown. Once anything builds, grep the build logs forwill be rejected by a future version. Also look for new inference errors from theBox<T, A>impl generalisation (rust#161946) and the more preciseif letclosure capture (rust#154210).boxpatterns are no longer syntactically allowed (rust#156749). Only crates using them underRUSTC_BOOTSTRAPare affected.-Ctarget-feature/-Ctarget-cpuvalues are now hard errors (rust#161280). rust-arm-embedded passes none.stacks/rustbuild-dir cache. The stack setsCARGO_BUILD_BUILD_DIR = "{cargo-cache-home}/build". Old-layout caches there are not reused after the switch, so expect one cold build per project and stale old-layout content until it is cleaned.LD_LIBRARY_PATHreasoning inrust/build.sh. It assumes the default llvm is in the rust build sandbox, which is true today:bootstrap.tomluses/usr/bin/llvm-config.data/frozen_packages.toml[[rule]] name = "rustc-1.99.1"in a separate pm PR. It is not part of this PR.packages/hex0/amd64-ladder.nclandpackages/llvm-21/build.nclstill mention rustc-1.98.1 / LLVM 21 as rust's stage0.rustc-1.98.1is now unreferenced byrustand can be retired, or kept for the ladder, in a follow-up.🤖 Generated with Claude Code
Summary by CodeRabbit
Updates
Bug Fixes