diff --git a/.gitignore b/.gitignore index c6ba45c..b649832 100644 --- a/.gitignore +++ b/.gitignore @@ -462,3 +462,5 @@ /rustc-1.93.0-src.tar.xz /wasi-libc-wasi-sdk-29.tar.gz /rustc-1.93.0-src.tar.xz.asc +/rustc-1.94.1-src.tar.xz +/rustc-1.94.1-src.tar.xz.asc diff --git a/0001-Update-amdgpu-data-layout.patch b/0001-Update-amdgpu-data-layout.patch new file mode 100644 index 0000000..70e9a1b --- /dev/null +++ b/0001-Update-amdgpu-data-layout.patch @@ -0,0 +1,44 @@ +From bf3ac98d6930ba4e258cf33240c2fe7c99d19eae Mon Sep 17 00:00:00 2001 +From: Nikita Popov +Date: Tue, 6 Jan 2026 11:51:33 +0100 +Subject: [PATCH 1/3] Update amdgpu data layout + +This changed in: +https://github.com/llvm/llvm-project/commit/853760bca6aa7a960b154cef8c61f87271870b8a +--- + compiler/rustc_codegen_llvm/src/context.rs | 5 +++++ + compiler/rustc_target/src/spec/targets/amdgcn_amd_amdhsa.rs | 2 +- + 2 files changed, 6 insertions(+), 1 deletion(-) + +diff --git a/compiler/rustc_codegen_llvm/src/context.rs b/compiler/rustc_codegen_llvm/src/context.rs +index 4b2544b7efdf..4328b15c73f3 100644 +--- a/compiler/rustc_codegen_llvm/src/context.rs ++++ b/compiler/rustc_codegen_llvm/src/context.rs +@@ -215,6 +215,11 @@ pub(crate) unsafe fn create_module<'ll>( + // LLVM 22 updated the ABI alignment for double on AIX: https://github.com/llvm/llvm-project/pull/144673 + target_data_layout = target_data_layout.replace("-f64:32:64", ""); + } ++ if sess.target.arch == Arch::AmdGpu { ++ // LLVM 22 specified ELF mangling in the amdgpu data layout: ++ // https://github.com/llvm/llvm-project/pull/163011 ++ target_data_layout = target_data_layout.replace("-m:e", ""); ++ } + } + + // Ensure the data-layout values hardcoded remain the defaults. +diff --git a/compiler/rustc_target/src/spec/targets/amdgcn_amd_amdhsa.rs b/compiler/rustc_target/src/spec/targets/amdgcn_amd_amdhsa.rs +index 828d853ac65e..d6a2cfc2aab5 100644 +--- a/compiler/rustc_target/src/spec/targets/amdgcn_amd_amdhsa.rs ++++ b/compiler/rustc_target/src/spec/targets/amdgcn_amd_amdhsa.rs +@@ -5,7 +5,7 @@ + pub(crate) fn target() -> Target { + Target { + arch: Arch::AmdGpu, +- data_layout: "e-p:64:64-p1:64:64-p2:32:32-p3:32:32-p4:64:64-p5:32:32-p6:32:32-p7:160:256:256:32-p8:128:128:128:48-p9:192:256:256:32-i64:64-v16:16-v24:32-v32:32-v48:64-v96:128-v192:256-v256:256-v512:512-v1024:1024-v2048:2048-n32:64-S32-A5-G1-ni:7:8:9".into(), ++ data_layout: "e-m:e-p:64:64-p1:64:64-p2:32:32-p3:32:32-p4:64:64-p5:32:32-p6:32:32-p7:160:256:256:32-p8:128:128:128:48-p9:192:256:256:32-i64:64-v16:16-v24:32-v32:32-v48:64-v96:128-v192:256-v256:256-v512:512-v1024:1024-v2048:2048-n32:64-S32-A5-G1-ni:7:8:9".into(), + llvm_target: "amdgcn-amd-amdhsa".into(), + metadata: TargetMetadata { + description: Some("AMD GPU".into()), +-- +2.53.0 + diff --git a/0002-Avoid-passing-addrspacecast-to-lifetime-intrinsics.patch b/0002-Avoid-passing-addrspacecast-to-lifetime-intrinsics.patch new file mode 100644 index 0000000..93cb498 --- /dev/null +++ b/0002-Avoid-passing-addrspacecast-to-lifetime-intrinsics.patch @@ -0,0 +1,89 @@ +From 0be66603ac37474fe884ad1b384510d1ddc37417 Mon Sep 17 00:00:00 2001 +From: Nikita Popov +Date: Tue, 6 Jan 2026 12:14:36 +0100 +Subject: [PATCH 2/3] Avoid passing addrspacecast to lifetime intrinsics + +Since LLVM 22 the alloca must be passed directly. Do this by +stripping the addrspacecast if it exists. +--- + compiler/rustc_codegen_llvm/src/builder.rs | 3 +++ + compiler/rustc_codegen_llvm/src/llvm/ffi.rs | 1 + + compiler/rustc_llvm/llvm-wrapper/RustWrapper.cpp | 4 ++++ + tests/codegen-llvm/amdgpu-addrspacecast.rs | 11 ++++++++++- + 4 files changed, 18 insertions(+), 1 deletion(-) + +diff --git a/compiler/rustc_codegen_llvm/src/builder.rs b/compiler/rustc_codegen_llvm/src/builder.rs +index 557ae7b0333e..9379faf1156f 100644 +--- a/compiler/rustc_codegen_llvm/src/builder.rs ++++ b/compiler/rustc_codegen_llvm/src/builder.rs +@@ -1788,6 +1788,9 @@ fn call_lifetime_intrinsic(&mut self, intrinsic: &'static str, ptr: &'ll Value, + } + + if crate::llvm_util::get_version() >= (22, 0, 0) { ++ // LLVM 22 requires the lifetime intrinsic to act directly on the alloca, ++ // there can't be an addrspacecast in between. ++ let ptr = unsafe { llvm::LLVMRustStripPointerCasts(ptr) }; + self.call_intrinsic(intrinsic, &[self.val_ty(ptr)], &[ptr]); + } else { + self.call_intrinsic(intrinsic, &[self.val_ty(ptr)], &[self.cx.const_u64(size), ptr]); +diff --git a/compiler/rustc_codegen_llvm/src/llvm/ffi.rs b/compiler/rustc_codegen_llvm/src/llvm/ffi.rs +index c535fade9c04..a3d4e9f9d32a 100644 +--- a/compiler/rustc_codegen_llvm/src/llvm/ffi.rs ++++ b/compiler/rustc_codegen_llvm/src/llvm/ffi.rs +@@ -1967,6 +1967,7 @@ pub(crate) fn LLVMRustGlobalAddMetadata<'a>( + Metadata: &'a Metadata, + ); + pub(crate) fn LLVMRustIsNonGVFunctionPointerTy(Val: &Value) -> bool; ++ pub(crate) fn LLVMRustStripPointerCasts<'a>(Val: &'a Value) -> &'a Value; + + // Operations on scalar constants + pub(crate) fn LLVMRustConstIntGetZExtValue(ConstantVal: &ConstantInt, Value: &mut u64) -> bool; +diff --git a/compiler/rustc_llvm/llvm-wrapper/RustWrapper.cpp b/compiler/rustc_llvm/llvm-wrapper/RustWrapper.cpp +index 336d58974036..599f79d01198 100644 +--- a/compiler/rustc_llvm/llvm-wrapper/RustWrapper.cpp ++++ b/compiler/rustc_llvm/llvm-wrapper/RustWrapper.cpp +@@ -1760,6 +1760,10 @@ extern "C" bool LLVMRustIsNonGVFunctionPointerTy(LLVMValueRef V) { + return false; + } + ++extern "C" LLVMValueRef LLVMRustStripPointerCasts(LLVMValueRef V) { ++ return wrap(unwrap(V)->stripPointerCasts()); ++} ++ + extern "C" bool LLVMRustLLVMHasZlibCompression() { + return llvm::compression::zlib::isAvailable(); + } +diff --git a/tests/codegen-llvm/amdgpu-addrspacecast.rs b/tests/codegen-llvm/amdgpu-addrspacecast.rs +index 16a0c276ac0e..144565f7e28c 100644 +--- a/tests/codegen-llvm/amdgpu-addrspacecast.rs ++++ b/tests/codegen-llvm/amdgpu-addrspacecast.rs +@@ -1,16 +1,25 @@ + // Check that pointers are casted to addrspace(0) before they are used + +-//@ compile-flags: --crate-type=rlib --target=amdgcn-amd-amdhsa -Ctarget-cpu=gfx900 ++//@ compile-flags: --crate-type=rlib --target=amdgcn-amd-amdhsa -Ctarget-cpu=gfx900 -O + //@ needs-llvm-components: amdgpu + //@ add-minicore ++//@ revisions: LLVM21 LLVM22 ++//@ [LLVM21] max-llvm-major-version: 21 ++//@ [LLVM22] min-llvm-version: 22 + #![feature(no_core)] + #![no_core] + + extern crate minicore; + ++// Make sure that on LLVM 22, the alloca is passed directly to the lifetime intrinsics, ++// not the addrspacecast. ++ + // CHECK-LABEL: @ref_of_local + // CHECK: [[alloca:%[0-9]]] = alloca + // CHECK: %i = addrspacecast ptr addrspace(5) [[alloca]] to ptr ++// LLVM22: call void @llvm.lifetime.start.p5(ptr addrspace(5) [[alloca]]) ++// CHECK: call void %f(ptr{{.*}}%i) ++// LLVM22: call void @llvm.lifetime.end.p5(ptr addrspace(5) [[alloca]]) + #[no_mangle] + pub fn ref_of_local(f: fn(&i32)) { + let i = 0; +-- +2.53.0 + diff --git a/0003-Don-t-use-evex512-with-LLVM-22.patch b/0003-Don-t-use-evex512-with-LLVM-22.patch new file mode 100644 index 0000000..9b11c2a --- /dev/null +++ b/0003-Don-t-use-evex512-with-LLVM-22.patch @@ -0,0 +1,35 @@ +From 08da3685eddca11092fecab35c053843e02df0aa Mon Sep 17 00:00:00 2001 +From: Nikita Popov +Date: Fri, 9 Jan 2026 14:56:11 +0100 +Subject: [PATCH 3/3] Don't use evex512 with LLVM 22 + +As Intel has walked back on the existence of AVX 10.1-256, LLVM +no longer uses evex512 and avx-10.n-512 are now avx-10.n instead, +so we can skip all the special handling on LLVM 22. +--- + compiler/rustc_codegen_llvm/src/llvm_util.rs | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/compiler/rustc_codegen_llvm/src/llvm_util.rs b/compiler/rustc_codegen_llvm/src/llvm_util.rs +index 63f820dc2918..fbb582fe8601 100644 +--- a/compiler/rustc_codegen_llvm/src/llvm_util.rs ++++ b/compiler/rustc_codegen_llvm/src/llvm_util.rs +@@ -287,12 +287,12 @@ pub(crate) fn to_llvm_features<'a>(sess: &Session, s: &'a str) -> Option Some(LLVMFeature::new("cx16")), + "lahfsahf" => Some(LLVMFeature::new("sahf")), + // Enable the evex512 target feature if an avx512 target feature is enabled. +- s if s.starts_with("avx512") => Some(LLVMFeature::with_dependencies( ++ s if s.starts_with("avx512") && major < 22 => Some(LLVMFeature::with_dependencies( + s, + smallvec![TargetFeatureFoldStrength::EnableOnly("evex512")], + )), +- "avx10.1" => Some(LLVMFeature::new("avx10.1-512")), +- "avx10.2" => Some(LLVMFeature::new("avx10.2-512")), ++ "avx10.1" if major < 22 => Some(LLVMFeature::new("avx10.1-512")), ++ "avx10.2" if major < 22 => Some(LLVMFeature::new("avx10.2-512")), + "apxf" => Some(LLVMFeature::with_dependencies( + "egpr", + smallvec![ +-- +2.53.0 + diff --git a/rust.spec b/rust.spec index c4d5bc5..21d106c 100644 --- a/rust.spec +++ b/rust.spec @@ -1,5 +1,5 @@ Name: rust -Version: 1.93.0 +Version: 1.94.1 Release: %autorelease Summary: The Rust Programming Language License: (Apache-2.0 OR MIT) AND (Artistic-2.0 AND BSD-3-Clause AND ISC AND MIT AND MPL-2.0 AND Unicode-3.0) @@ -14,9 +14,9 @@ ExclusiveArch: %{rust_arches} # To bootstrap from scratch, set the channel and date from src/stage0 # e.g. 1.89.0 wants rustc: 1.88.0-2025-06-26 # or nightly wants some beta-YYYY-MM-DD -%global bootstrap_version 1.92.0 -%global bootstrap_channel 1.92.0 -%global bootstrap_date 2025-12-11 +%global bootstrap_version 1.93.0 +%global bootstrap_channel 1.93.0 +%global bootstrap_date 2026-01-22 # Only the specified arches will use bootstrap binaries. # NOTE: Those binaries used to be uploaded with every new release, but that was @@ -46,34 +46,25 @@ ExclusiveArch: %{rust_arches} # See src/bootstrap/src/core/build_steps/llvm.rs, fn check_llvm_version # See src/llvm-project/cmake/Modules/LLVMVersion.cmake for bundled version. %global min_llvm_version 20.0.0 -%global bundled_llvm_version 21.1.5 +%global bundled_llvm_version 21.1.8 #global llvm_compat_version 19 %global llvm llvm%{?llvm_compat_version} %bcond_with bundled_llvm # Requires stable libgit2 1.9, and not the next minor soname change. # This needs to be consistent with the bindings in vendor/libgit2-sys. -%global min_libgit2_version 1.9.0 +%global min_libgit2_version 1.9.2 %global next_libgit2_version 1.10.0~ -%global bundled_libgit2_version 1.9.1 +%global bundled_libgit2_version 1.9.2 %if 0%{?fedora} >= 41 %bcond_with bundled_libgit2 %else %bcond_without bundled_libgit2 %endif -# Try to use system oniguruma (only used at build time for rust-docs) -# src/tools/rustbook -> ... -> onig_sys v69.9.1 needs at least 6.9.3 -%global min_oniguruma_version 6.9.3 -%if 0%{?rhel} && 0%{?rhel} < 9 -%bcond_without bundled_oniguruma -%else -%bcond_with bundled_oniguruma -%endif - # Cargo uses UPSERTs with omitted conflict targets %global min_sqlite3_version 3.35 -%global bundled_sqlite3_version 3.50.2 +%global bundled_sqlite3_version 3.51.1 %if 0%{?rhel} && 0%{?rhel} < 10 %bcond_without bundled_sqlite3 %else @@ -143,7 +134,7 @@ Patch4: 0001-bootstrap-allow-disabling-target-self-contained.patch Patch5: 0002-set-an-external-library-path-for-wasm32-wasi.patch # We don't want to use the bundled library in libsqlite3-sys -Patch6: rustc-1.93.0-unbundle-sqlite.patch +Patch6: rustc-1.94.0-unbundle-sqlite.patch # stage0 tries to copy all of /usr/lib, sometimes unsuccessfully, see #143735 Patch7: 0001-only-copy-rustlib-into-stage0-sysroot.patch @@ -152,6 +143,12 @@ Patch7: 0001-only-copy-rustlib-into-stage0-sysroot.patch # https://github.com/rust-lang/rust/pull/152077 Patch8: 0001-bootstrap-always-propagate-CARGO_TARGET_-host-_LINKE.patch +# Fixes for LLVM 22 compatibility +# https://github.com/rust-lang/rust/pull/151410 +Patch9: 0001-Update-amdgpu-data-layout.patch +Patch10: 0002-Avoid-passing-addrspacecast-to-lifetime-intrinsics.patch +Patch11: 0003-Don-t-use-evex512-with-LLVM-22.patch + ### RHEL-specific patches below ### # Simple rpm macros for rust-toolset (as opposed to full rust-packaging) @@ -161,7 +158,7 @@ Source102: cargo_vendor.attr Source103: cargo_vendor.prov # Disable cargo->libgit2->libssh2 on RHEL, as it's not approved for FIPS (rhbz1732949) -Patch100: rustc-1.93.0-disable-libssh2.patch +Patch100: rustc-1.94.1-disable-libssh2.patch # When building wasi, prevent linking a compiler-rt builtins library we don't have. Patch1000: wasi-no-link-builtins.patch @@ -283,10 +280,6 @@ BuildRequires: pkgconfig(zlib) BuildRequires: (pkgconfig(libgit2) >= %{min_libgit2_version} with pkgconfig(libgit2) < %{next_libgit2_version}) %endif -%if %{without bundled_oniguruma} -BuildRequires: pkgconfig(oniguruma) >= %{min_oniguruma_version} -%endif - %if %{without bundled_sqlite3} BuildRequires: pkgconfig(sqlite3) >= %{min_sqlite3_version} %endif @@ -727,6 +720,9 @@ rm -rf %{wasi_libc_dir}/dlmalloc/ %endif %patch -P7 -p1 %patch -P8 -p1 +%patch -P9 -p1 +%patch -P10 -p1 +%patch -P11 -p1 %if %with disabled_libssh2 %patch -P100 -p1 @@ -766,10 +762,6 @@ rm -rf src/tools/rustc-perf/collector/*-benchmarks/ %clear_dir vendor/libgit2-sys*/libgit2/ %endif -%if %without bundled_oniguruma -%clear_dir vendor/onig_sys*/oniguruma/ -%endif - %if %without bundled_sqlite3 %clear_dir vendor/libsqlite3-sys*/sqlite3/ %endif @@ -836,7 +828,6 @@ end} %global rust_env %{shrink: %{?rustflags:RUSTFLAGS="%{rustflags}"} %{rustc_target_cpus} - %{!?with_bundled_oniguruma:RUSTONIG_SYSTEM_LIBONIG=1} %{!?with_bundled_sqlite3:LIBSQLITE3_SYS_USE_PKG_CONFIG=1} %{!?with_disabled_libssh2:LIBSSH2_SYS_USE_PKG_CONFIG=1} %{?llvm_path:PATH="%{llvm_path}:$PATH"} @@ -1121,6 +1112,10 @@ rm -rf "./build/%{rust_triple}/test/" # We test this after packaging %global cargo_test_skip_list net_err_suggests_fetch_with_cli +# Requires access to index.crates.io but neither Fedora nor CentOS/RHEL builders +# have DNS resolution, so the test will always fail. +%global cargo_test_skip_list %{cargo_test_skip_list} publish_to_crates_io_warns + %ifarch aarch64 # https://github.com/rust-lang/rust/issues/123733 %global cargo_test_skip_list %{cargo_test_skip_list} panic_abort_doc_tests @@ -1168,16 +1163,18 @@ rm -rf "./build/%{rust_triple}/stage2-tools/%{rust_triple}/cit/" %dir %{rustlibdir}/%{rust_triple} %dir %{rustlibdir}/%{rust_triple}/lib %{rustlibdir}/%{rust_triple}/lib/*.rlib +%{rustlibdir}/%{rust_triple}/lib/*.rmeta %{rustlibdir}/%{rust_triple}/lib/*.so %license build/manifests/std/cargo-vendor.txt %license %{_pkgdocdir}/COPYRIGHT-library.html -%global target_files() \ -%files std-static-%1 \ -%dir %{rustlibdir} \ -%dir %{rustlibdir}/%1 \ -%dir %{rustlibdir}/%1/lib \ -%{rustlibdir}/%1/lib/*.rlib \ +%global target_files() \ +%files std-static-%1 \ +%dir %{rustlibdir} \ +%dir %{rustlibdir}/%1 \ +%dir %{rustlibdir}/%1/lib \ +%{rustlibdir}/%1/lib/*.rlib \ +%{rustlibdir}/%1/lib/*.rmeta \ %license build/manifests/std-%1/cargo-vendor.txt %if %target_enabled i686-pc-windows-gnu diff --git a/rustc-1.93.0-unbundle-sqlite.patch b/rustc-1.93.0-unbundle-sqlite.patch deleted file mode 100644 index 955a1fc..0000000 --- a/rustc-1.93.0-unbundle-sqlite.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- rustc-beta-src/src/tools/cargo/Cargo.lock.orig 2025-12-18 15:09:44.157650741 -0600 -+++ rustc-beta-src/src/tools/cargo/Cargo.lock 2025-12-18 15:10:14.837395011 -0600 -@@ -2817,7 +2817,6 @@ version = "0.35.0" - source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "133c182a6a2c87864fe97778797e46c7e999672690dc9fa3ee8e241aa4a9c13f" - dependencies = [ -- "cc", - "pkg-config", - "vcpkg", - ] ---- rustc-beta-src/src/tools/cargo/Cargo.toml.orig 2025-12-18 15:09:57.641723932 -0600 -+++ rustc-beta-src/src/tools/cargo/Cargo.toml 2025-12-18 15:10:36.866959259 -0600 -@@ -83,7 +83,7 @@ proptest = "1.9.0" - pulldown-cmark = { version = "0.13.0", default-features = false, features = ["html"] } - rand = "0.9.2" - regex = "1.12.2" --rusqlite = { version = "0.37.0", features = ["bundled"] } -+rusqlite = { version = "0.37.0", features = [] } - rustc-hash = "2.1.1" - rustc-stable-hash = "0.1.2" - rustfix = { version = "0.9.2", path = "crates/rustfix" } diff --git a/rustc-1.94.0-unbundle-sqlite.patch b/rustc-1.94.0-unbundle-sqlite.patch new file mode 100644 index 0000000..4445e35 --- /dev/null +++ b/rustc-1.94.0-unbundle-sqlite.patch @@ -0,0 +1,23 @@ +diff -up rustc-beta-src/src/tools/cargo/Cargo.lock.orig rustc-beta-src/src/tools/cargo/Cargo.lock +--- rustc-beta-src/src/tools/cargo/Cargo.lock.orig 2026-01-24 22:38:02.000000000 -0800 ++++ rustc-beta-src/src/tools/cargo/Cargo.lock 2026-01-27 13:20:44.594573906 -0800 +@@ -2807,7 +2807,6 @@ version = "0.36.0" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "95b4103cffefa72eb8428cb6b47d6627161e51c2739fc5e3b734584157bc642a" + dependencies = [ +- "cc", + "pkg-config", + "vcpkg", + ] +diff -up rustc-beta-src/src/tools/cargo/Cargo.toml.orig rustc-beta-src/src/tools/cargo/Cargo.toml +--- rustc-beta-src/src/tools/cargo/Cargo.toml.orig 2026-01-24 22:38:02.000000000 -0800 ++++ rustc-beta-src/src/tools/cargo/Cargo.toml 2026-01-27 13:20:38.024949181 -0800 +@@ -82,7 +82,7 @@ proptest = "1.9.0" + pulldown-cmark = { version = "0.13.0", default-features = false, features = ["html"] } + rand = "0.9.2" + regex = "1.12.2" +-rusqlite = { version = "0.38.0", features = ["bundled"] } ++rusqlite = { version = "0.38.0", features = [] } + rustc-hash = "2.1.1" + rustc-stable-hash = "0.1.2" + rustfix = { version = "0.9.2", path = "crates/rustfix" } diff --git a/rustc-1.93.0-disable-libssh2.patch b/rustc-1.94.1-disable-libssh2.patch similarity index 50% rename from rustc-1.93.0-disable-libssh2.patch rename to rustc-1.94.1-disable-libssh2.patch index 2598b1b..a06473a 100644 --- a/rustc-1.93.0-disable-libssh2.patch +++ b/rustc-1.94.1-disable-libssh2.patch @@ -1,6 +1,7 @@ ---- rustc-beta-src/src/tools/cargo/Cargo.lock.orig 2025-12-18 15:41:44.817782261 -0600 -+++ rustc-beta-src/src/tools/cargo/Cargo.lock 2025-12-18 15:45:06.653151595 -0600 -@@ -2775,7 +2775,6 @@ checksum = "1c42fe03df2bd3c53a3a9c7317ad +diff -up rustc-beta-src/src/tools/cargo/Cargo.lock.orig rustc-beta-src/src/tools/cargo/Cargo.lock +--- rustc-beta-src/src/tools/cargo/Cargo.lock.orig 2026-01-27 13:27:00.716308204 -0800 ++++ rustc-beta-src/src/tools/cargo/Cargo.lock 2026-01-27 13:27:00.718429578 -0800 +@@ -2764,7 +2764,6 @@ checksum = "c9b3acc4b91781bb0b3386669d32 dependencies = [ "cc", "libc", @@ -8,7 +9,7 @@ "libz-sys", "openssl-sys", "pkg-config", -@@ -2822,20 +2821,6 @@ dependencies = [ +@@ -2810,20 +2809,6 @@ dependencies = [ "pkg-config", "vcpkg", ] @@ -29,14 +30,15 @@ [[package]] name = "libz-rs-sys" ---- rustc-beta-src/src/tools/cargo/Cargo.toml.orig 2025-12-18 15:41:49.665815151 -0600 -+++ rustc-beta-src/src/tools/cargo/Cargo.toml 2025-12-18 15:45:45.253541794 -0600 +diff -up rustc-beta-src/src/tools/cargo/Cargo.toml.orig rustc-beta-src/src/tools/cargo/Cargo.toml +--- rustc-beta-src/src/tools/cargo/Cargo.toml.orig 2026-01-27 13:27:00.716725971 -0800 ++++ rustc-beta-src/src/tools/cargo/Cargo.toml 2026-01-27 13:29:24.709692974 -0800 @@ -48,7 +48,7 @@ curl = "0.4.49" - curl-sys = "0.4.83" + curl-sys = "=0.4.83" filetime = "0.2.26" flate2 = { version = "1.1.5", default-features = false, features = ["zlib-rs"] } --git2 = "0.20.2" -+git2 = { version = "0.20.2", default-features = false, features = ["https"] } +-git2 = "0.20.3" ++git2 = { version = "0.20.3", default-features = false, features = ["https"] } git2-curl = "0.21.0" # When updating this, also see if `gix-transport` further down needs updating or some auth-related tests will fail. - gix = { version = "0.74.1", default-features = false, features = ["progress-tree", "parallel", "dirwalk", "status"] } + gix = { version = "0.77.0", default-features = false, features = ["progress-tree", "parallel", "dirwalk", "status"] } diff --git a/sources b/sources index df084a1..fde172b 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (rustc-1.93.0-src.tar.xz) = 9362a4b56529ce29362e256daf382b73c73204d0e9fe5b39addf07ff66a30aa66c967e34df9021ea007c13a9f3bb6efdefca1c8e4ea1bde9aac050a9fb0c736b +SHA512 (rustc-1.94.1-src.tar.xz) = 4d20f5b2df042517b14aa4d1a7e4b149b7490ac6be9977d9273f5f81b70ca110b35c554693e1c8a8e4722bdb06532d3972a88c0cb7a8081d3d1bdb23e01e1546 +SHA512 (rustc-1.94.1-src.tar.xz.asc) = 6176d98acf9367e13afaef1c90ebca555f3ad08c44504f5cf23b7963959ee01ace1e99bf56aaf4f629bfb320eaca01b1940ba1819ce523d0cf336c97a69b21b7 SHA512 (wasi-libc-wasi-sdk-29.tar.gz) = ee803c0eb6c5dab119660926cb2d3ce044cc6f1f32b7cc266d89c25c031480f34c27ab2638df34e192321add629699c6a473438b94f899a28ae9e806ab07d87b -SHA512 (rustc-1.93.0-src.tar.xz.asc) = a6ea05bb6b7d3b429a1c863622c93ac4c97b25f56027f7f06f085acde26d1395f3515cc764ae3ef941d1669556a02365755b34e28ccaebe70c1ccb84c977228f