Do not call rm_rf_glob in a loop for paths that do not depend on file_types

Author: osiewicz

src/cargo/ops/cargo_clean.rs

@@ -212,28 +212,15 @@ 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);
                     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("*"));
                         let unhashed_name = file_type.output_filename(target, None);
-                        let dir_glob = escape_glob_path(dir)?;
-                        let dir_glob = Path::new(&dir_glob);
 
                         clean_ctx.rm_rf_glob(&dir_glob.join(&hashed_name))?;
                         clean_ctx.rm_rf(&dir.join(&unhashed_name))?;
-                        // 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)?;
 
                         // Remove the uplifted copy.
                         if let Some(uplift_dir) = uplift_dir {
@@ -244,6 +231,20 @@ fn clean_specs(
                             clean_ctx.rm_rf(&dep_info)?;
                         }
                     }
+                    // 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)?;
+
                     // TODO: what to do about build_script_build?
                     let dir = escape_glob_path(layout.incremental())?;
                     let incremental = Path::new(&dir).join(format!("{}-*", crate_name));