Auto merge of #7400 - snf:fix_7358, r=alexcrichton

Removing hash from output files when using MSVC

This is the fix for #7358 suggested by @alexcrichton . Tested and working.

I see a few tests failling but seem unrelated. I'll investigate them tomorrow.

Author: bors

src/cargo/core/compiler/context/compilation_files.rs

@@ -495,7 +495,8 @@ fn compute_metadata<'a, 'cfg>(
     if !(unit.mode.is_any_test() || unit.mode.is_check())
         && (unit.target.is_dylib()
             || unit.target.is_cdylib()
-            || (unit.target.is_executable() && unit.kind.short_name(bcx).starts_with("wasm32-")))
+            || (unit.target.is_executable() && unit.kind.short_name(bcx).starts_with("wasm32-"))
+            || (unit.target.is_executable() && unit.kind.short_name(bcx).contains("msvc")))
         && unit.pkg.package_id().source_id().is_path()
         && __cargo_default_lib_metadata.is_err()
     {

tests/testsuite/build.rs

@@ -4207,8 +4207,7 @@ fn uplift_pdb_of_bin_on_windows() {
     p.cargo("build --bins --examples --tests").run();
     assert!(p.target_debug_dir().join("foo.pdb").is_file());
     assert!(p.target_debug_dir().join("b.pdb").is_file());
-    assert!(!p.target_debug_dir().join("examples/c.pdb").exists());
-    assert_eq!(p.glob("target/debug/examples/c-*.pdb").count(), 1);
+    assert!(p.target_debug_dir().join("examples/c.pdb").exists());
     assert!(!p.target_debug_dir().join("c.pdb").exists());
     assert!(!p.target_debug_dir().join("d.pdb").exists());
 }

tests/testsuite/collisions.rs

@@ -1,4 +1,6 @@
-use cargo_test_support::{basic_manifest, project};
+#[cfg(not(target_env = "msvc"))]
+use cargo_test_support::basic_manifest;
+use cargo_test_support::project;
 use std::env;
 
 #[cargo_test]
@@ -54,6 +56,7 @@ This may become a hard error in the future; see <https://github.com/rust-lang/ca
 }
 
 #[cargo_test]
+#[cfg(not(target_env = "msvc"))]
 fn collision_example() {
     // Examples in a workspace can easily collide.
     let p = project()
@@ -83,6 +86,7 @@ This may become a hard error in the future; see <https://github.com/rust-lang/ca
 }
 
 #[cargo_test]
+#[cfg(not(target_env = "msvc"))]
 fn collision_export() {
     // `--out-dir` combines some things which can cause conflicts.
     let p = project()

tests/testsuite/freshness.rs

@@ -423,6 +423,7 @@ fn changing_bin_paths_common_target_features_caches_targets() {
 }
 
 #[cargo_test]
+#[cfg(not(target_env = "msvc"))]
 fn changing_bin_features_caches_targets() {
     let p = project()
         .file(