From fded120b253d39195ec1b7ca002ad29053d141a4 Mon Sep 17 00:00:00 2001 From: Eman Resu <78693624+quatquatt@users.noreply.github.com> Date: Tue, 26 May 2026 14:13:00 -0400 Subject: [PATCH] build-support/rust: remove assertMsg usage --- .../rust/build-rust-crate/test/rcgen-crates.nix | 2 +- pkgs/build-support/rust/build-rust-package/default.nix | 5 +++-- pkgs/build-support/rust/import-cargo-lock.nix | 8 +++++--- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/pkgs/build-support/rust/build-rust-crate/test/rcgen-crates.nix b/pkgs/build-support/rust/build-rust-crate/test/rcgen-crates.nix index 857862b54100..804308ed216f 100644 --- a/pkgs/build-support/rust/build-rust-crate/test/rcgen-crates.nix +++ b/pkgs/build-support/rust/build-rust-crate/test/rcgen-crates.nix @@ -4669,7 +4669,7 @@ rec { # Not rate-limited, CDN URL. url = "https://static.crates.io/crates/${crateConfig.crateName}/${crateConfig.crateName}-${crateConfig.version}.crate"; sha256 = - assert (lib.assertMsg (crateConfig ? sha256) "Missing sha256 for ${name}"); + assert crateConfig ? sha256 || throw "Missing sha256 for ${name}"; crateConfig.sha256; }); extraRustcOpts = diff --git a/pkgs/build-support/rust/build-rust-package/default.nix b/pkgs/build-support/rust/build-rust-package/default.nix index ab0fec1a2a95..be511e775784 100644 --- a/pkgs/build-support/rust/build-rust-package/default.nix +++ b/pkgs/build-support/rust/build-rust-package/default.nix @@ -78,8 +78,9 @@ lib.extendMkDerivation { ... }@args: - assert lib.assertMsg useFetchCargoVendor - "buildRustPackage: `useFetchCargoVendor` is non‐optional and enabled by default as of 25.05, remove it"; + assert + useFetchCargoVendor + || throw "buildRustPackage: `useFetchCargoVendor` is non‐optional and enabled by default as of 25.05, remove it"; assert lib.warnIf (args ? useFetchCargoVendor) "buildRustPackage: `useFetchCargoVendor` is non‐optional and enabled by default as of 25.05, remove it" diff --git a/pkgs/build-support/rust/import-cargo-lock.nix b/pkgs/build-support/rust/import-cargo-lock.nix index 9c172c7842f8..4e406242780a 100644 --- a/pkgs/build-support/rust/import-cargo-lock.nix +++ b/pkgs/build-support/rust/import-cargo-lock.nix @@ -120,9 +120,11 @@ let checksum = pkg.checksum or parsedLockFile.metadata."checksum ${pkg.name} ${pkg.version} (${pkg.source})"; in - assert lib.assertMsg (checksum != null) '' - Package ${pkg.name} does not have a checksum. - ''; + assert + checksum != null + || throw '' + Package ${pkg.name} does not have a checksum. + ''; fetchurl { name = "crate-${pkg.name}-${pkg.version}.tar.gz"; url = "${downloadUrl}/${pkg.name}/${pkg.version}/download";