Add rm_rf_prefix_list

Author: osiewicz

src/cargo/ops/cargo_clean.rs

@@ -193,6 +193,8 @@ fn clean_specs(
                 continue;
             }
             let crate_name = target.crate_name();
+            let path_dot = format!("{crate_name}.");
+            let path_dash = format!("{crate_name}-");
             for &mode in &[
                 CompileMode::Build,
                 CompileMode::Test,
@@ -212,8 +214,8 @@ fn clean_specs(
                         TargetKind::Test | TargetKind::Bench => (layout.deps(), None),
                         _ => (layout.deps(), Some(layout.dest())),
                     };
-                    let dir_glob = escape_glob_path(dir)?;
-                    let dir_glob = Path::new(&dir_glob);
+                    let mut dir_glob_str = escape_glob_path(dir)?;
+                    let dir_glob = Path::new(&dir_glob_str);
                     for file_type in file_types {
                         // Some files include a hash in the filename, some don't.
                         let hashed_name = file_type.output_filename(target, Some("*"));
@@ -233,17 +235,21 @@ fn clean_specs(
                     }
                     // Remove dep-info file generated by rustc. It is not tracked in
                     // file_types. It does not have a prefix.
-                    let hashed_dep_info = dir_glob.join(format!("{}-*.d", crate_name));
-                    clean_ctx.rm_rf_glob(&hashed_dep_info)?;
                     let unhashed_dep_info = dir.join(format!("{}.d", crate_name));
                     clean_ctx.rm_rf(&unhashed_dep_info)?;
                     // Remove split-debuginfo files generated by rustc.
-                    let split_debuginfo_obj = dir_glob.join(format!("{}.*.o", crate_name));
-                    clean_ctx.rm_rf_glob(&split_debuginfo_obj)?;
-                    let split_debuginfo_dwo = dir_glob.join(format!("{}.*.dwo", crate_name));
-                    clean_ctx.rm_rf_glob(&split_debuginfo_dwo)?;
-                    let split_debuginfo_dwp = dir_glob.join(format!("{}.*.dwp", crate_name));
-                    clean_ctx.rm_rf_glob(&split_debuginfo_dwp)?;
+
+                    let paths = [
+                        (path_dash.as_str(), ".d"),
+                        (path_dot.as_str(), ".o"),
+                        (path_dot.as_str(), ".dwo"),
+                        (path_dot.as_str(), ".dwp"),
+                    ];
+                    if !dir_glob_str.ends_with(std::path::MAIN_SEPARATOR) {
+                        dir_glob_str.push(std::path::MAIN_SEPARATOR);
+                    }
+                    dir_glob_str.push('*');
+                    clean_ctx.rm_rf_prefix_list(&dir_glob_str.as_str(), &paths)?;
 
                     // TODO: what to do about build_script_build?
                     let dir = escape_glob_path(layout.incremental())?;
@@ -323,6 +329,26 @@ impl<'gctx> CleanContext<'gctx> {
         Ok(())
     }
 
+    fn rm_rf_prefix_list(
+        &mut self,
+        pattern: &str,
+        path_matchers: &[(&str, &str)],
+    ) -> CargoResult<()> {
+        // TODO: Display utf8 warning to user?  Or switch to globset?
+
+        for path in glob::glob(pattern)? {
+            let path = path?;
+            let filename = path.file_name().and_then(|name| name.to_str()).unwrap();
+            if path_matchers
+                .iter()
+                .any(|(prefix, suffix)| filename.starts_with(prefix) && filename.ends_with(suffix))
+            {
+                self.rm_rf(&path)?;
+            }
+        }
+        Ok(())
+    }
+
     pub fn rm_rf(&mut self, path: &Path) -> CargoResult<()> {
         let meta = match fs::symlink_metadata(path) {
             Ok(meta) => meta,