Merge pull request #329 from RalfJung/dependencies

dependencies: heuristic to distinguish host and target artifacts

Author: oli-obk

CHANGELOG.md

@@ -14,6 +14,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Changed
 
+- DependencyBuilder: if `config.target` is set (which is always the case if you use `run_tests_generic`),
+  ui_test now supports the same crate showing up as a direct dependency and a dependency of a proc-macro.
+
 ### Removed
 
 ## [0.30.1] - 2025-05-28

Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "ui_test"
-version = "0.30.1"
+version = "0.30.2"
 edition = "2021"
 license = "MIT OR Apache-2.0"
 description = "A test framework for testing rustc diagnostics output"

Cargo.toml

@@ -156,6 +156,50 @@ fn build_dependencies_inner(
                 {
                     continue;
                 }
+                if let Some(target) = &config.target {
+                    // We passed `--target` to cargo. This means host and target dependencies will
+                    // end up in different folders, which we can use to distinguish them! We only
+                    // want to add target dependencies, and their folder will look something like:
+                    // ```
+                    // .../target/ui_test/0/x86_64-unknown-linux-gnu/debug/deps/libquote-031e34ffdd9a346e.rlib
+                    // ```
+                    // So we skip all artifacts where, popping the top 3 components, we do not see
+                    // the target. However, we do *not* do this for proc-macro crates as those will
+                    // only ever show up as host crates anyway.
+                    let skip_crate = 'skip_crate: {
+                        let Some(filename) = artifact.filenames.first() else {
+                            // No filename? No idea what this is...
+                            break 'skip_crate false;
+                        };
+                        if artifact
+                            .target
+                            .crate_types
+                            .iter()
+                            .any(|ctype| ctype == "proc-macro")
+                        {
+                            // Proc macros are only ever built for the host, don't skip that.
+                            break 'skip_crate false;
+                        }
+                        // Not a proc macro, let's check the path.
+                        let mut filename = filename.to_path_buf();
+                        filename.pop();
+                        // We also validate that the path looks as expected before we actually skip.
+                        if filename.file_name().unwrap_or_default() != "deps" {
+                            // Either cargo changed or this is a weird corner case, let's just
+                            // keep it.
+                            break 'skip_crate false;
+                        }
+                        filename.pop();
+                        // This is the profile name, `debug` or `release` or so.
+                        filename.pop();
+                        // And now this should be the target name.
+                        // If not, skip it.
+                        filename.file_name().unwrap_or_default() != target
+                    };
+                    if skip_crate {
+                        continue;
+                    }
+                }
                 for filename in &artifact.filenames {
                     import_paths.insert(filename.parent().unwrap().into());
                 }

src/dependencies.rs

@@ -6,7 +6,10 @@ edition = "2021"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
+# A proc-macro dependency, needs special treatment.
 serde_derive = "1.0"
+# `quote` now shows up both as host and target dependency -- let's make sure that works.
+quote = "1.0.25"
 
 [dev-dependencies]
 ui_test = { path = "../../.."}