From 59a80387601730e28b987b7c0ab3b9770e6b5416 Mon Sep 17 00:00:00 2001 From: Dmitry Marakasov Date: Thu, 17 Apr 2025 16:12:54 +0300 Subject: [PATCH] =?UTF-8?q?lang/rust-nightly:=20update=201.88.0.20250402?= =?UTF-8?q?=20=E2=86=92=201.88.0.20250416?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Approved by: rust (implicit) --- lang/rust-nightly/Makefile | 4 +-- lang/rust-nightly/distinfo | 18 ++++++------- ...ch-src_bootstrap_src_core_config_config.rs | 14 ---------- lang/rust-nightly/files/patch-vendor_cc.rs | 26 +++++++++---------- 4 files changed, 24 insertions(+), 38 deletions(-) delete mode 100644 lang/rust-nightly/files/patch-src_bootstrap_src_core_config_config.rs diff --git a/lang/rust-nightly/Makefile b/lang/rust-nightly/Makefile index b7ae29e6f3c9..7e0f883640a4 100644 --- a/lang/rust-nightly/Makefile +++ b/lang/rust-nightly/Makefile @@ -14,8 +14,8 @@ MASTERDIR= ${.CURDIR}/../rust PATCHDIR= ${.CURDIR}/files DISTINFO_FILE= ${.CURDIR}/distinfo -NIGHTLY_DATE= 2025-04-02 -BOOTSTRAPS_DATE= 2025-02-18 +NIGHTLY_DATE= 2025-04-16 +BOOTSTRAPS_DATE= 2025-04-02 RUST_BOOTSTRAP_VERSION= beta .include "${MASTERDIR}/Makefile" diff --git a/lang/rust-nightly/distinfo b/lang/rust-nightly/distinfo index 39765842bf25..53f12c89434c 100644 --- a/lang/rust-nightly/distinfo +++ b/lang/rust-nightly/distinfo @@ -1,9 +1,9 @@ -TIMESTAMP = 1743681715 -SHA256 (rust/2025-04-02/rustc-nightly-src.tar.xz) = 93ae6bc04d67dbe3ed8fa28e19331c60115d4848e8f70e21c141e4ff7ffc84d6 -SIZE (rust/2025-04-02/rustc-nightly-src.tar.xz) = 283623996 -SHA256 (rust/2025-02-18/rustc-beta-x86_64-unknown-freebsd.tar.xz) = 52ab3212d64b56a8da207fe976cbc8d266e962a61c742e6069137b10ff25c3c1 -SIZE (rust/2025-02-18/rustc-beta-x86_64-unknown-freebsd.tar.xz) = 85822636 -SHA256 (rust/2025-02-18/rust-std-beta-x86_64-unknown-freebsd.tar.xz) = 11bae401884cce0306b415bb1202c2c63f81395677057fbbe12e9302951a9d3d -SIZE (rust/2025-02-18/rust-std-beta-x86_64-unknown-freebsd.tar.xz) = 27638072 -SHA256 (rust/2025-02-18/cargo-beta-x86_64-unknown-freebsd.tar.xz) = c244ec4f97420c29c690e32bd6d8f14994bf1d990747f31a3dc0f2b37644493e -SIZE (rust/2025-02-18/cargo-beta-x86_64-unknown-freebsd.tar.xz) = 10434836 +TIMESTAMP = 1744886442 +SHA256 (rust/2025-04-16/rustc-nightly-src.tar.xz) = 316454878d27da6ec89517100b2323ec5a92cde522d0602552e9aae30de8219f +SIZE (rust/2025-04-16/rustc-nightly-src.tar.xz) = 282292384 +SHA256 (rust/2025-04-02/rustc-beta-x86_64-unknown-freebsd.tar.xz) = c8d0147c625faa5ce0e75c2509827bc4b190ad286e41411bce92023e00eb7a1d +SIZE (rust/2025-04-02/rustc-beta-x86_64-unknown-freebsd.tar.xz) = 88062036 +SHA256 (rust/2025-04-02/rust-std-beta-x86_64-unknown-freebsd.tar.xz) = 8bef59b74196fa9f7839bb491f6b32d0761a45c8d7178980ee3afd80231b836e +SIZE (rust/2025-04-02/rust-std-beta-x86_64-unknown-freebsd.tar.xz) = 28281300 +SHA256 (rust/2025-04-02/cargo-beta-x86_64-unknown-freebsd.tar.xz) = eae168df54ddfe95db669c205ae97baa902056722856fa174758ebd058168a95 +SIZE (rust/2025-04-02/cargo-beta-x86_64-unknown-freebsd.tar.xz) = 10577536 diff --git a/lang/rust-nightly/files/patch-src_bootstrap_src_core_config_config.rs b/lang/rust-nightly/files/patch-src_bootstrap_src_core_config_config.rs deleted file mode 100644 index 7756a2cf4f13..000000000000 --- a/lang/rust-nightly/files/patch-src_bootstrap_src_core_config_config.rs +++ /dev/null @@ -1,14 +0,0 @@ ---- src/bootstrap/src/core/config/config.rs.orig 2025-04-01 18:22:03 UTC -+++ src/bootstrap/src/core/config/config.rs -@@ -3016,9 +3016,9 @@ impl Config { - || source_version.minor == stage0_version.minor + 1))) - { - let prev_version = format!("{}.{}.x", source_version.major, source_version.minor - 1); -- fail(&format!( -+ println!( - "Unexpected {component_name} version: {stage0_version}, we should use {prev_version}/{source_version} to build source with {source_version}" -- )); -+ ); - } - } - diff --git a/lang/rust-nightly/files/patch-vendor_cc.rs b/lang/rust-nightly/files/patch-vendor_cc.rs index d8fe88b7682b..5e5be8f932a0 100644 --- a/lang/rust-nightly/files/patch-vendor_cc.rs +++ b/lang/rust-nightly/files/patch-vendor_cc.rs @@ -43,19 +43,6 @@ https://reviews.llvm.org/D77776 - (true, _, _, _, false) | (_, _, _, true, false) => Ok(ToolFamily::Clang { - zig_cc: is_zig_cc(path, cargo_output), - }), -+ (true, _, _, _, false) | (_, _, _, true, false) => Ok(ToolFamily::Gnu), - (false, false, true, _, false) | (_, _, _, _, true) => Ok(ToolFamily::Gnu), - (false, false, false, false, false) => { - cargo_output.print_warning(&"Compiler family detection failed since it does not define `__clang__`, `__GNUC__`, `__EMSCRIPTEN__` or `__VXWORKS__`, also does not accept cl style flag `-?`, fallback to treating it as GNU"); ---- vendor/cc-1.2.10/src/tool.rs.orig 2025-04-01 18:22:03 UTC -+++ vendor/cc-1.2.10/src/tool.rs -@@ -137,9 +137,7 @@ impl Tool { - - match (clang, accepts_cl_style_flags, gcc, emscripten, vxworks) { - (clang_cl, true, _, false, false) => Ok(ToolFamily::Msvc { clang_cl }), -- (true, _, _, _, false) | (_, _, _, true, false) => Ok(ToolFamily::Clang { -- zig_cc: is_zig_cc(path, cargo_output), -- }), + (true, _, _, _, false) | (_, _, _, true, false) => Ok(ToolFamily::Gnu), (false, false, true, _, false) | (_, _, _, _, true) => Ok(ToolFamily::Gnu), (false, false, false, false, false) => { @@ -86,3 +73,16 @@ https://reviews.llvm.org/D77776 (false, false, true, _, false) | (_, _, _, _, true) => Ok(ToolFamily::Gnu), (false, false, false, false, false) => { cargo_output.print_warning(&"Compiler family detection failed since it does not define `__clang__`, `__GNUC__`, `__EMSCRIPTEN__` or `__VXWORKS__`, also does not accept cl style flag `-?`, fallback to treating it as GNU"); +--- vendor/cc-1.2.18/src/tool.rs.orig 2025-04-01 18:22:03 UTC ++++ vendor/cc-1.2.18/src/tool.rs +@@ -141,9 +141,7 @@ impl Tool { + + match (clang, accepts_cl_style_flags, gcc, emscripten, vxworks) { + (clang_cl, true, _, false, false) => Ok(ToolFamily::Msvc { clang_cl }), +- (true, _, _, _, false) | (_, _, _, true, false) => Ok(ToolFamily::Clang { +- zig_cc: is_zig_cc(path, cargo_output), +- }), ++ (true, _, _, _, false) | (_, _, _, true, false) => Ok(ToolFamily::Gnu), + (false, false, true, _, false) | (_, _, _, _, true) => Ok(ToolFamily::Gnu), + (false, false, false, false, false) => { + cargo_output.print_warning(&"Compiler family detection failed since it does not define `__clang__`, `__GNUC__`, `__EMSCRIPTEN__` or `__VXWORKS__`, also does not accept cl style flag `-?`, fallback to treating it as GNU");