Revert #11183

[weihanglo]

This reverts commit d4c38af, reversing changes made to 92d8826.

Fixes #11330

---

The root cause is that map_to_features_for takes care of unit_for.host_features from parent unit, but here we only want to know whether the dependency is for host or not.

We could have an ad-hoc FeaturesFor construction there, but I'd rather revert it at this moment. The interaction between UnitFor and FeaturesFor bites me every time 😭.

After this revert, if we want to resolve #10526 again. The fastest way is doing the following:

diff --git a/src/cargo/core/compiler/unit_dependencies.rs b/src/cargo/core/compiler/unit_dependencies.rs
index 9319a19e0..14cc84941 100644
--- a/src/cargo/core/compiler/unit_dependencies.rs
+++ b/src/cargo/core/compiler/unit_dependencies.rs
@@ -1103,7 +1103,7 @@ impl<'a, 'cfg> State<'a, 'cfg> {
                         // If this is an optional dependency, and the new feature resolver
                         // did not enable it, don't include it.
                         if dep.is_optional() {
-                            let features_for = unit_for.map_to_features_for(dep.artifact());
+                            let features_for = unit_for.map_to_features_for(None));
                             if !self.is_dep_activated(pkg_id, features_for, dep.name_in_toml()) {
                                 return false;
                             }

[rustbot]

r? @epage

(rustbot has picked a reviewer for you, use r? to override)

[weihanglo]

r? @ehuss

You may want to have a look. Thanks!

[ehuss]

@bors r+

[bors]

📌 Commit 5fe2732 has been approved by ehuss

It is now in the queue for this repository.

[bors]

⌛ Testing commit 5fe2732 with merge 4111d42...

[bors]

💔 Test failed - checks-actions

[weihanglo]

#11332 fixes the failing semver-check

@bors retry

[bors]

⌛ Testing commit 5fe2732 with merge d828b5b...

[weihanglo]

@bors r-

[bors]

💔 Test failed - checks-actions

[weihanglo]

@bors retry

[ehuss]

Retry doesn't work after r-. Retry is only for retrying an already approved PR, but with r- it is no longer in the "approved" state.

@bors r+

[bors]

📌 Commit 5fe2732 has been approved by ehuss

It is now in the queue for this repository.

[bors]

⌛ Testing commit 5fe2732 with merge 7d8d028...

[bors]

☀️ Test successful - checks-actions
Approved by: ehuss
Pushing 7d8d028 to master...