Date: Wed, 15 Apr 2026 14:57:27 +0000 From: Dmitry Marakasov <amdmi3@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 7d31586ad42b - main - lang/rust-nightly: update 1.96.0.2026032=?utf-8?Q?6 =E2=86=92 1.?=97.0.20260413 Message-ID: <69dfa757.1c9cd.70db2eab@gitrepo.freebsd.org>
index | next in thread | raw e-mail
The branch main has been updated by amdmi3: URL: https://cgit.FreeBSD.org/ports/commit/?id=7d31586ad42bdbfd0dc8c7ec35b3409fb2c17859 commit 7d31586ad42bdbfd0dc8c7ec35b3409fb2c17859 Author: Dmitry Marakasov <amdmi3@FreeBSD.org> AuthorDate: 2026-04-15 14:55:25 +0000 Commit: Dmitry Marakasov <amdmi3@FreeBSD.org> CommitDate: 2026-04-15 14:57:23 +0000 lang/rust-nightly: update 1.96.0.20260326 → 1.97.0.20260413 The patch-src_tools_cargo_src_cargo_sources_git_source.rs was updated for newer cargo and needs additional review [1]. PR: 256581 [1] Approved by: rust (implicit) --- lang/rust-nightly/Makefile | 4 +-- lang/rust-nightly/distinfo | 6 ++-- ...src_tools_cargo_src_cargo_sources_git_source.rs | 35 +++++++++++----------- 3 files changed, 22 insertions(+), 23 deletions(-) diff --git a/lang/rust-nightly/Makefile b/lang/rust-nightly/Makefile index 08b65d97f699..84ee1c4f4c1b 100644 --- a/lang/rust-nightly/Makefile +++ b/lang/rust-nightly/Makefile @@ -1,5 +1,5 @@ # Run update.sh to update to the latest nightly -PORTVERSION= 1.96.0.${NIGHTLY_DATE:C,-,,g} +PORTVERSION= 1.97.0.${NIGHTLY_DATE:C,-,,g} # Always set PORTREVISION explicitly as otherwise it is inherited from lang/rust PORTREVISION= 0 PKGNAMESUFFIX= -nightly @@ -14,7 +14,7 @@ MASTERDIR= ${.CURDIR}/../rust PATCHDIR= ${.CURDIR}/files DISTINFO_FILE= ${.CURDIR}/distinfo -NIGHTLY_DATE= 2026-03-26 +NIGHTLY_DATE= 2026-04-13 BOOTSTRAPS_DATE= 2026-03-05 RUST_BOOTSTRAP_VERSION= beta diff --git a/lang/rust-nightly/distinfo b/lang/rust-nightly/distinfo index 707edc139b75..1b865f758eeb 100644 --- a/lang/rust-nightly/distinfo +++ b/lang/rust-nightly/distinfo @@ -1,6 +1,6 @@ -TIMESTAMP = 1774616569 -SHA256 (rust/2026-03-26/rustc-nightly-src.tar.xz) = 0c7764c1c5455c5c518440094d12feb503878c4e743eb2a733bca23ec7582f5d -SIZE (rust/2026-03-26/rustc-nightly-src.tar.xz) = 239881732 +TIMESTAMP = 1776186317 +SHA256 (rust/2026-04-13/rustc-nightly-src.tar.xz) = 19cefc5037efb7bcba96f38fa30769bec90d9a5bbe131b2a212a054432668980 +SIZE (rust/2026-04-13/rustc-nightly-src.tar.xz) = 241502536 SHA256 (rust/2026-03-05/rustc-beta-x86_64-unknown-freebsd.tar.xz) = c773c2e91b829ef50736baf135e34aaca6f85a6c3ba338a955b22934f0a0e007 SIZE (rust/2026-03-05/rustc-beta-x86_64-unknown-freebsd.tar.xz) = 92465400 SHA256 (rust/2026-03-05/rust-std-beta-x86_64-unknown-freebsd.tar.xz) = bf727d7b87bafcc2cfdd45a61e9b728a73024cd141fdc37dcfe9731545645e2d diff --git a/lang/rust-nightly/files/patch-src_tools_cargo_src_cargo_sources_git_source.rs b/lang/rust-nightly/files/patch-src_tools_cargo_src_cargo_sources_git_source.rs index 3add18d71b22..bb97fdf79bd9 100644 --- a/lang/rust-nightly/files/patch-src_tools_cargo_src_cargo_sources_git_source.rs +++ b/lang/rust-nightly/files/patch-src_tools_cargo_src_cargo_sources_git_source.rs @@ -10,27 +10,26 @@ useful for USES=cargo, the patch-in-config feature also needs to be stabilized first. It will be available in Rust 1.56. [1] https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=256581 - ---- src/tools/cargo/src/cargo/sources/git/source.rs.orig 2021-10-04 20:59:57 UTC +--- src/tools/cargo/src/cargo/sources/git/source.rs.orig 2026-04-11 13:43:17 UTC +++ src/tools/cargo/src/cargo/sources/git/source.rs -@@ -205,6 +205,9 @@ impl<'cfg> Source for GitSource<'cfg> { - kind: QueryKind, - f: &mut dyn FnMut(IndexSummary), - ) -> Poll<CargoResult<()>> { -+ if std::env::var("CARGO_FREEBSD_PORTS_SKIP_GIT_UPDATE").is_ok() { -+ return Poll::Ready(Ok(())); -+ } - if let Some(src) = self.path_source.as_mut() { - src.query(dep, kind, f) - } else { -@@ -228,6 +231,10 @@ impl<'cfg> Source for GitSource<'cfg> { - if self.path_source.is_some() { - self.mark_used(None)?; +@@ -254,6 +254,10 @@ impl<'gctx> GitSource<'gctx> { return Ok(()); + } + ++ if std::env::var("CARGO_FREEBSD_PORTS_SKIP_GIT_UPDATE").is_ok() { ++ return Ok(()); + } + + let git_fs = self.gctx.git_path(); + // Ignore errors creating it, in case this is a read-only filesystem: + // perhaps the later operations can succeed anyhow. +@@ -393,6 +397,9 @@ impl<'gctx> Source for GitSource<'gctx> { + kind: QueryKind, + f: &mut dyn FnMut(IndexSummary), + ) -> CargoResult<()> { + if std::env::var("CARGO_FREEBSD_PORTS_SKIP_GIT_UPDATE").is_ok() { -+ return Ok(()); ++ return Ok(()) ++ } + if self.path_source.borrow().is_none() { + self.update()?; } - - let git_fs = self.config.git_path();home | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?69dfa757.1c9cd.70db2eab>