Make Dylint happy

Author: smoelius

test-fuzz/tests/integration/ci.rs

@@ -99,7 +99,7 @@ fn markdown_link_check() {
         .logged_assert()
         .success();
 
-    let readme_md = Path::new(env!("CARGO_MANIFEST_DIR")).join("../README.md");
+    let readme_md = Path::new(concat!(env!("CARGO_MANIFEST_DIR"), "/../README.md"));
 
     Command::new("npx")
         .args(["markdown-link-check", readme_md.to_str().unwrap()])
@@ -282,12 +282,15 @@ fn supply_chain() {
     remove_avatars(&mut value);
     let stdout_normalized = serde_json::to_string_pretty(&value).unwrap();
 
-    let path_buf = Path::new(env!("CARGO_MANIFEST_DIR")).join("tests/supply_chain.json");
+    let path = Path::new(concat!(
+        env!("CARGO_MANIFEST_DIR"),
+        "/tests/supply_chain.json"
+    ));
 
     if enabled("BLESS") {
-        write(path_buf, stdout_normalized).unwrap();
+        write(path, stdout_normalized).unwrap();
     } else {
-        let stdout_expected = read_to_string(&path_buf).unwrap();
+        let stdout_expected = read_to_string(path).unwrap();
 
         assert!(
             stdout_expected == stdout_normalized,

test-fuzz/tests/integration/conversion.rs

@@ -21,7 +21,7 @@ fn test() -> Command {
     command.args([
         "test",
         "--manifest-path",
-        &MANIFEST_PATH,
+        MANIFEST_PATH,
         "--no-run",
         "--features",
         &("test-fuzz/".to_owned() + test_fuzz::serde_format::as_feature()),

test-fuzz/tests/integration/link.rs

@@ -11,7 +11,7 @@ fn link() {
         .args([
             "build",
             "--manifest-path",
-            &MANIFEST_PATH,
+            MANIFEST_PATH,
             "--features",
             &("test-fuzz/".to_owned() + test_fuzz::serde_format::as_feature()),
         ])

test-fuzz/tests/integration/rename.rs

@@ -22,7 +22,7 @@ fn test() -> Command {
     command.args([
         "test",
         "--manifest-path",
-        &MANIFEST_PATH,
+        MANIFEST_PATH,
         "--no-run",
         "--features",
         &("test-fuzz/".to_owned() + test_fuzz::serde_format::as_feature()),

test-fuzz/tests/integration/self_ty_in_mod_name.rs

@@ -27,7 +27,7 @@ fn test() -> Command {
     command.args([
         "test",
         "--manifest-path",
-        &MANIFEST_PATH,
+        MANIFEST_PATH,
         "--no-run",
         "--features",
         &("test-fuzz/".to_owned() + test_fuzz::serde_format::as_feature()),

test-fuzz/tests/integration/test_fuzz_log.rs

@@ -10,7 +10,7 @@ fn test_fuzz_log() {
         .args([
             "test",
             "--manifest-path",
-            &MANIFEST_PATH,
+            MANIFEST_PATH,
             "--no-run",
             "--features",
             &("test-fuzz/".to_owned() + test_fuzz::serde_format::as_feature()),

testing/src/fuzzable.rs

@@ -2,16 +2,11 @@ use anyhow::{Context, Result, bail, ensure};
 use cargo_metadata::{Artifact, ArtifactProfile, Message};
 use internal::serde_format;
 use log::debug;
-use std::{path::Path, process::Command, sync::LazyLock};
+use std::process::Command;
 use subprocess::{Exec, Redirection};
 
-pub static MANIFEST_PATH: LazyLock<String> = LazyLock::new(|| {
-    #[cfg_attr(dylint_lib = "general", allow(abs_home_path))]
-    Path::new(env!("CARGO_MANIFEST_DIR"))
-        .join("../fuzzable/Cargo.toml")
-        .to_string_lossy()
-        .to_string()
-});
+#[cfg_attr(dylint_lib = "general", allow(abs_home_path))]
+pub const MANIFEST_PATH: &str = concat!(env!("CARGO_MANIFEST_DIR"), "/../fuzzable/Cargo.toml");
 
 // smoelius: We want to reuse the existing features. So we can't do anything that would cause the
 // fuzzable examples to be rebuilt.
@@ -24,7 +19,7 @@ pub fn test(krate: &str, test: &str) -> Result<Command> {
     let mut args = vec![
         "test",
         "--manifest-path",
-        &*MANIFEST_PATH,
+        MANIFEST_PATH,
         "--test",
         krate,
         "--features",
@@ -95,7 +90,7 @@ pub fn test_fuzz_all() -> Result<Command> {
         "--",
         "test-fuzz",
         "--manifest-path",
-        &*MANIFEST_PATH,
+        MANIFEST_PATH,
         "--features",
         &serde_format_feature,
     ];

third-party/tests/third_party.rs

@@ -38,8 +38,7 @@ struct Test {
 
 static TESTS: LazyLock<Vec<Test>> = LazyLock::new(|| {
     #[cfg_attr(dylint_lib = "general", allow(abs_home_path))]
-    let content =
-        read_to_string(Path::new(env!("CARGO_MANIFEST_DIR")).join("third_party.json")).unwrap();
+    let content = read_to_string(concat!(env!("CARGO_MANIFEST_DIR"), "/third_party.json")).unwrap();
     serde_json::from_str(&content).unwrap()
 });
 
@@ -87,8 +86,7 @@ fn run_test(test: &Test, no_run: bool) {
         .success();
 
     #[cfg_attr(dylint_lib = "general", allow(abs_home_path))]
-    let patch = Path::new(env!("CARGO_MANIFEST_DIR"))
-        .join("patches")
+    let patch = Path::new(concat!(env!("CARGO_MANIFEST_DIR"), "/patches"))
         .join(&test.patch)
         .canonicalize()
         .unwrap();