Merge branch 'master' into dependabot/cargo/cargo-util-0.2.14

trailofbits · Sep 9, 2024 · 13804e0 · 13804e0
2 parents 8193141 + 5ff2dfe
commit 13804e0
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 6 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/dylint/src/library_packages/cargo_cli/mod.rs b/dylint/src/library_packages/cargo_cli/mod.rs
@@ -189,6 +189,9 @@ fn git_dependency_root(url: &str, details: &TomlDetailedDependency) -> Result<Pa
         }
     }
 
+    // smoelius: If we get here, it should be because `find_accessed_subdir` failed twice.
+    debug_assert!(errors.len() >= 2);
+
     Err(anyhow!("Could not find git dependency root: {errors:#?}"))
 }
 

diff --git a/examples/general/abs_home_path/README.md b/examples/general/abs_home_path/README.md
@@ -2,7 +2,7 @@
 
 ### What it does
 Checks for string literals that are absolute paths into the user's home directory, e.g.,
-`env!(CARGO_MANIFEST_DIR)`.
+`env!("CARGO_MANIFEST_DIR")`.
 
 ### Why is this bad?
 The path might not exist when the code is used in production.

diff --git a/examples/general/abs_home_path/src/lib.rs b/examples/general/abs_home_path/src/lib.rs
@@ -21,7 +21,7 @@ use std::{
 dylint_linting::impl_late_lint! {
     /// ### What it does
     /// Checks for string literals that are absolute paths into the user's home directory, e.g.,
-    /// `env!(CARGO_MANIFEST_DIR)`.
+    /// `env!("CARGO_MANIFEST_DIR")`.
     ///
     /// ### Why is this bad?
     /// The path might not exist when the code is used in production.
-Original file line number
+Diff line change
@@ Expand Up @@
             }
         }
+        // smoelius: If we get here, it should be because `find_accessed_subdir` failed twice.
+        debug_assert!(errors.len() >= 2);
         Err(anyhow!("Could not find git dependency root: {errors:#?}"))
     }
@@ Expand Down @@