diff --git a/lang/rust-nightly/Makefile b/lang/rust-nightly/Makefile
index 9f9f06f3a282..14a957888e13 100644
--- a/lang/rust-nightly/Makefile
+++ b/lang/rust-nightly/Makefile
@@ -1,25 +1,25 @@
 # Run update.sh to update to the latest nightly
-PORTVERSION=	1.90.0.${NIGHTLY_DATE:C,-,,g}
+PORTVERSION=	1.91.0.${NIGHTLY_DATE:C,-,,g}
 # Always set PORTREVISION explicitly as otherwise it is inherited from lang/rust
 PORTREVISION=	0
 PKGNAMESUFFIX=	-nightly
 DISTNAME=	rustc-nightly-src
 
 ONLY_FOR_ARCHS=	amd64
 ONLY_FOR_ARCHS_REASON=	upstream does not provide bootstraps for other architectures
 
 CONFLICTS_INSTALL=	rust
 
 MASTERDIR=	${.CURDIR}/../rust
 PATCHDIR=	${.CURDIR}/files
 DISTINFO_FILE=	${.CURDIR}/distinfo
 
-NIGHTLY_DATE=		2025-07-27
+NIGHTLY_DATE=		2025-08-05
 BOOTSTRAPS_DATE=	2025-06-24
 RUST_BOOTSTRAP_VERSION=	beta
 
 post-configure:
 	# remove after bootstraps are updated to version higher than 2025-07-27
 	@${REINPLACE_CMD} -e '/ccache=/d' ${WRKSRC}/config.toml
 
 .include "${MASTERDIR}/Makefile"
diff --git a/lang/rust-nightly/distinfo b/lang/rust-nightly/distinfo
index 764599dbb119..8dbff4c87479 100644
--- a/lang/rust-nightly/distinfo
+++ b/lang/rust-nightly/distinfo
@@ -1,9 +1,9 @@
-TIMESTAMP = 1753714244
-SHA256 (rust/2025-07-27/rustc-nightly-src.tar.xz) = 6c2697608c4abf419914b5ab1f8683b3b1f9a01e22d92b015c4315864fcd2356
-SIZE (rust/2025-07-27/rustc-nightly-src.tar.xz) = 277043964
+TIMESTAMP = 1754482083
+SHA256 (rust/2025-08-05/rustc-nightly-src.tar.xz) = 428963a5586248c0f088dff1dda048060b447c2bf187ca2326b62af47c80f9fc
+SIZE (rust/2025-08-05/rustc-nightly-src.tar.xz) = 272353928
 SHA256 (rust/2025-06-24/rustc-beta-x86_64-unknown-freebsd.tar.xz) = 71e9e3a1d1f5e8dc98403c2a6695c969908ba0cde594c4e20249fe81b67d62d1
 SIZE (rust/2025-06-24/rustc-beta-x86_64-unknown-freebsd.tar.xz) = 88377504
 SHA256 (rust/2025-06-24/rust-std-beta-x86_64-unknown-freebsd.tar.xz) = 7cc4adb3c102eac53916b28c0dad40bd095e19ea3fd0430e84a2e0b094445809
 SIZE (rust/2025-06-24/rust-std-beta-x86_64-unknown-freebsd.tar.xz) = 28253396
 SHA256 (rust/2025-06-24/cargo-beta-x86_64-unknown-freebsd.tar.xz) = be762a368c6dfbe47a0f8c4b09cea1755a6d311f713b57b57a87276c88e5c34d
 SIZE (rust/2025-06-24/cargo-beta-x86_64-unknown-freebsd.tar.xz) = 10790116
diff --git a/lang/rust-nightly/files/patch-vendor_cc.rs b/lang/rust-nightly/files/patch-vendor_cc.rs
index ef0ac3dc5c04..11682cd5f1f6 100644
--- a/lang/rust-nightly/files/patch-vendor_cc.rs
+++ b/lang/rust-nightly/files/patch-vendor_cc.rs
@@ -1,140 +1,140 @@
 When the compiler has "clang" in its name the cc crate will pass
 an LLVM target triple to it.  Rust uses a triple that lacks the OS
 version and LLVM will default to FreeBSD 9 behavior, i.e., it will
 default to libstdc++ which is no longer available in newer releases.
 
 To avoid this issue assume we have a GNU compatible toolchain instead
 until LLVM can be updated to use libc++ by default.
 
 https://reviews.llvm.org/D77776
 
 --- vendor/cc-1.1.18/src/tool.rs.orig	2025-06-08 20:17:28 UTC
 +++ vendor/cc-1.1.18/src/tool.rs
 @@ -174,9 +174,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");
 --- vendor/cc-1.2.0/src/tool.rs.orig	2024-12-10 13:16:09 UTC
 +++ vendor/cc-1.2.0/src/tool.rs
 @@ -174,9 +174,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");
 --- vendor/cc-1.2.13/src/tool.rs.orig	2025-04-01 18:22:03 UTC
 +++ vendor/cc-1.2.13/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");
 --- vendor/cc-1.2.16/src/tool.rs.orig	2025-04-01 18:22:03 UTC
 +++ vendor/cc-1.2.16/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");
 --- vendor/cc-1.2.19/src/tool.rs.orig	2025-04-01 18:22:03 UTC
 +++ vendor/cc-1.2.19/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");
 --- vendor/cc-1.2.20/src/tool.rs.orig	2025-04-01 18:22:03 UTC
 +++ vendor/cc-1.2.20/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");
 --- vendor/cc-1.2.23/src/tool.rs.orig	2025-04-01 18:22:03 UTC
 +++ vendor/cc-1.2.23/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");
 --- vendor/cc-1.2.26/src/tool.rs.orig	2025-04-01 18:22:03 UTC
 +++ vendor/cc-1.2.26/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");
 --- vendor/cc-1.2.27/src/tool.rs.orig	2025-04-01 18:22:03 UTC
 +++ vendor/cc-1.2.27/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");
---- vendor/cc-1.2.30/src/tool.rs.orig	2025-04-01 18:22:03 UTC
-+++ vendor/cc-1.2.30/src/tool.rs
+--- vendor/cc-1.2.31/src/tool.rs.orig	2025-04-01 18:22:03 UTC
++++ vendor/cc-1.2.31/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");