Auto merge of #7860 - ehuss:fix-std-collision, r=alexcrichton

Fix build-std collisions.

`build-std` unit filenames can collide with user dependencies in some situations.  In particular, `cc` as a build-dependency is likely to be exactly the same as a user's dep.  This would result in the `cc` crate being built twice, but with the same filename, causing a collision.

Other dependencies typically never collide because they have the `rustc-dep-of-std` feature, but build-dependencies do not.

The solution here is to include `is_std` in the metadata hash.

Fixes #7859.

Author: bors

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

@@ -587,5 +587,15 @@ fn compute_metadata<'a, 'cfg>(
     if let Ok(ref channel) = __cargo_default_lib_metadata {
         channel.hash(&mut hasher);
     }
+
+    // std units need to be kept separate from user dependencies. std crates
+    // are differentiated in the Unit with `is_std` (for things like
+    // `-Zforce-unstable-if-unmarked`), so they are always built separately.
+    // This isn't strictly necessary for build dependencies which probably
+    // don't need unstable support. A future experiment might be to set
+    // `is_std` to false for build dependencies so that they can be shared
+    // with user dependencies.
+    unit.is_std.hash(&mut hasher);
+
     Some(Metadata(hasher.finish()))
 }

src/cargo/core/compiler/fingerprint.rs

@@ -60,6 +60,7 @@
 //! -C incremental=… flag                      | ✓           |
 //! mtime of sources                           | ✓[^3]       |
 //! RUSTFLAGS/RUSTDOCFLAGS                     | ✓           |
+//! is_std                                     |             | ✓
 //!
 //! [^1]: Build script and bin dependencies are not included.
 //!