Replace '-' with "_" in crate names

trailofbits · Mar 16, 2022 · b728be3 · b728be3
1 parent e7ae412
commit b728be3
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/dylint-link/src/main.rs b/dylint-link/src/main.rs
@@ -129,7 +129,7 @@ fn copy_library(path: &Path) -> Result<()> {
     if_chain! {
         if let Some(lib_name) = parse_path(path);
         let cargo_pkg_name = var(env::CARGO_PKG_NAME)?;
-        if lib_name == cargo_pkg_name.replace("-", "_");
+        if lib_name == cargo_pkg_name.replace('-', "_");
         then {
             let rustup_toolchain = var(env::RUSTUP_TOOLCHAIN)?;
             let filename_with_toolchain = library_filename(&lib_name, &rustup_toolchain);

diff --git a/utils/testing/src/lib.rs b/utils/testing/src/lib.rs
@@ -213,7 +213,7 @@ fn rustc_flags(metadata: &Metadata, package: &Package, target: &Target) -> Resul
                     && args
                         .as_slice()
                         .windows(2)
-                        .any(|window| window == ["--crate-name", &target.name])
+                        .any(|window| window == ["--crate-name", &snake_case(&target.name)])
                 {
                     Some(args)
                 } else {
@@ -244,8 +244,9 @@ fn remove_example(metadata: &Metadata, _package: &Package, target: &Target) -> R
 
         if let Some(file_name) = path.file_name() {
             let s = file_name.to_string_lossy();
-            if s == target.name.clone() + consts::EXE_SUFFIX
-                || s.starts_with(&(target.name.clone() + "-"))
+            let target_name = snake_case(&target.name);
+            if s == target_name.clone() + consts::EXE_SUFFIX
+                || s.starts_with(&(target_name.clone() + "-"))
             {
                 remove_file(&path).with_context(|| {
                     format!("`remove_file` failed for `{}`", path.to_string_lossy())
@@ -292,3 +293,7 @@ fn run_tests<'test>(
     };
     compiletest::run_tests(&config);
 }
+
+fn snake_case(name: &str) -> String {
+    name.replace('-', "_")
+}