Sync with star.

Author: wsx-antithesis

flake.nix

@@ -32,6 +32,10 @@
           workspace = version: (craneLib version).buildPackage (commonArgs // {
             cargoArtifacts = workspaceDeps version;
           });
+          workspaceEmptyFeature = version: (craneLib version).buildPackage (commonArgs // {
+            cargoArtifacts = workspaceDeps version;
+            cargoClippyExtraArgs = "--no-default-features";
+          });
           clippy = version: (craneLib version).cargoClippy (commonArgs // {
             cargoArtifacts = workspaceDeps version;
             cargoClippyExtraArgs = "--all-targets -- -D warnings";
@@ -47,6 +51,7 @@
           inherit craneLib workspaceDeps;
           antithesis-sdk-rust = {
             workspace = workspace "nightly";
+            workspaceEmptyFeature = workspaceEmptyFeature "nightly";
             workspaceMSRV = workspace (lib.importTOML ./lib/Cargo.toml).package.rust-version;
             clippy = clippy "nightly";
             test = test "nightly";
@@ -71,9 +76,9 @@
       packages = with pkgs; [ rust-analyzer cargo-msrv ];
     };
 
-    # TODO: Check combinations of feature flags & semver check.
+    # TODO: Perform semver check.
     checks = { antithesis-sdk-rust, ... }: {
-      inherit (antithesis-sdk-rust) workspaceMSRV clippy test;
+      inherit (antithesis-sdk-rust) workspaceMSRV workspaceEmptyFeature clippy test;
     };
 
     # TODO: Decide whether we want auto formatting.

lib/src/assert/macros.rs

@@ -84,13 +84,13 @@ macro_rules! assert_helper {
 #[doc(hidden)]
 #[macro_export]
 macro_rules! assert_helper {
-    (condition = $condition:expr, $message:literal, $details:expr, $assert_type:path, $display_type:literal, must_hit = $must_hit:literal) => {{
+    (condition = $condition:expr, $message:literal, $(details = $details:expr)?, $assert_type:path, $display_type:literal, must_hit = $must_hit:literal) => {{
         // Force evaluation of expressions, ensuring that
         // any side effects of these expressions will always be
         // evaluated at runtime - even if the assertion itself
         // is supressed by the `no-antithesis-sdk` feature
         let condition = $condition;
-        let details = $details;
+        $(let details = $details;)?
     }};
 }
 
@@ -367,7 +367,7 @@ macro_rules! numeric_guidance_helper {
 #[doc(hidden)]
 #[macro_export]
 macro_rules! numeric_guidance_helper {
-    ($assert:ident, $op:tt, $maximize:literal, $left:expr, $right:expr, $message:literal$(, $details:expr)?) => {
+    ($assert:path, $op:tt, $maximize:literal, $left:expr, $right:expr, $message:literal$(, $details:expr)?) => {
         assert!($left $op $right, $message$(, $details)?);
     };
 }
@@ -398,8 +398,11 @@ macro_rules! boolean_guidance_helper {
 #[macro_export]
 macro_rules! boolean_guidance_helper {
     ($assert:path, $all:literal, {$($name:ident: $cond:expr),*}, $message:literal$(, $details:expr)?) => {{
-        let cond = if $all { true $(&& $name)* } else { false $(|| $name)* },
-        $assert!(cond, $message$(, &$details)?);
+        let cond = {
+            $(let $name = $cond;)*
+            if $all { true $(&& $name)* } else { false $(|| $name)* }
+        };
+        $assert!(cond, $message$(, $details)?);
     }};
 }
 

lib/src/assert/mod.rs

@@ -14,10 +14,9 @@ use std::collections::HashMap;
 #[cfg(feature = "full")]
 use std::sync::Mutex;
 
-use self::guidance::GuidanceCatalogInfo;
-
 mod macros;
 #[doc(hidden)]
+#[cfg(feature = "full")]
 pub mod guidance;
 
 /// Catalog of all antithesis assertions provided
@@ -30,7 +29,7 @@ pub static ANTITHESIS_CATALOG: [AssertionCatalogInfo];
 #[doc(hidden)]
 #[distributed_slice]
 #[cfg(feature = "full")]
-pub static ANTITHESIS_GUIDANCE_CATALOG: [GuidanceCatalogInfo];
+pub static ANTITHESIS_GUIDANCE_CATALOG: [self::guidance::GuidanceCatalogInfo];
 
 // Only need an ASSET_TRACKER if there are actually assertions 'hit'
 // (i.e. encountered and invoked at runtime).