fix(tree): use artifact target feature key

Author: wan9chi

src/cargo/ops/tree/graph.rs

@@ -1,7 +1,7 @@
 //! Code for building the graph used by `cargo tree`.
 
 use super::TreeOptions;
-use crate::core::compiler::{CompileKind, RustcTargetData};
+use crate::core::compiler::{CompileKind, CompileTarget, RustcTargetData};
 use crate::core::dependency::DepKind;
 use crate::core::resolver::Resolve;
 use crate::core::resolver::features::{CliFeatures, FeaturesFor, ResolvedFeatures};
@@ -486,25 +486,24 @@ fn add_pkg(
         let dep_pkg = graph.package_map[&dep_id];
 
         for dep in deps {
-            let dep_features_for = match dep
-                .artifact()
-                .and_then(|artifact| artifact.target())
-                .and_then(|target| target.to_resolved_compile_target(requested_kind))
-            {
-                // Dependency has a `{ …, target = <triple> }`
-                Some(target) => FeaturesFor::ArtifactDep(target),
-                // Get the information of the dependent crate from `features_for`.
-                // If a dependent crate is
-                //
-                // * specified as an artifact dep with a `target`, or
-                // * a host dep,
-                //
-                // its transitive deps, including build-deps, need to be built on that target.
-                None if features_for != FeaturesFor::default() => features_for,
-                // Dependent crate is a normal dep, then back to old rules:
-                //
-                // * normal deps, dev-deps -> inherited target
-                // * build-deps -> host
+            // Keep this in sync with `FeatureResolver::deps`: `cargo tree`
+            // looks up already-resolved features, so it must use the same key.
+            let dep_features_for = match dep.artifact().and_then(|artifact| artifact.target()) {
+                // `target = "target"` with a host requested kind is keyed as
+                // `ArtifactDep(<host triple>)`, not `HostDep`.
+                Some(artifact_target) => {
+                    match artifact_target.to_resolved_compile_kind(requested_kind) {
+                        CompileKind::Target(target) => FeaturesFor::ArtifactDep(target),
+                        CompileKind::Host => {
+                            let host = CompileTarget::new(
+                                &target_data.rustc.host,
+                                target_data.gctx.cli_unstable().json_target_spec,
+                            )
+                            .expect("host target triple is always valid");
+                            FeaturesFor::ArtifactDep(host)
+                        }
+                    }
+                }
                 None => {
                     if dep.is_build() || dep_pkg.proc_macro() {
                         FeaturesFor::HostDep

tests/testsuite/artifact_dep.rs

@@ -1604,10 +1604,13 @@ fn tree_with_build_artifact_dep_inheriting_target() {
 
     p.cargo("tree -Z bindeps")
         .masquerade_as_nightly_cargo(&["bindeps"])
-        .with_status(101)
-        .with_stderr_contains(
-            "did not find features for (PackageId { name: \"bar\", version: \"0.5.0\", source: [..] }, HostDep) within activated_features:",
-        )
+        .with_stdout_data(str![[r#"
+foo v0.0.0 ([ROOT]/foo)
+[build-dependencies]
+└── bar v0.5.0 ([ROOT]/foo/bar)
+    └── pm v0.1.0 (proc-macro) ([ROOT]/foo/pm)
+
+"#]])
         .run();
 }