diff --git a/cargo-auditable/src/auditable_from_metadata.rs b/cargo-auditable/src/auditable_from_metadata.rs index 21cdc0f..6ec7751 100644 --- a/cargo-auditable/src/auditable_from_metadata.rs +++ b/cargo-auditable/src/auditable_from_metadata.rs @@ -237,12 +237,13 @@ fn proc_macro_packages(metadata: &cargo_metadata::Metadata) -> HashSet<&str> { .packages .iter() .filter_map(|pkg| { - // As of Rust 1.88 a single crate cannot be both a proc macro and something else. - // Checking that length is 1 is purely to hedge against support for it being added in the future. - if pkg.targets.len() == 1 - && pkg.targets[0].kind.len() == 1 - && pkg.targets[0].kind[0] == TargetKind::ProcMacro - { + // As of Rust 1.100 a single crate cannot be both a proc macro and something else. + // There may be extra targets such as tests or a build script, so we ignore those. + let is_proc_macro = pkg + .targets + .iter() + .any(|target| target.kind.len() == 1 && target.kind[0] == TargetKind::ProcMacro); + if is_proc_macro { Some(pkg.id.repr.as_str()) } else { None diff --git a/cargo-auditable/tests/fixtures/proc_macro_dependency/Cargo.toml b/cargo-auditable/tests/fixtures/proc_macro_dependency/Cargo.toml new file mode 100644 index 0000000..b4cd536 --- /dev/null +++ b/cargo-auditable/tests/fixtures/proc_macro_dependency/Cargo.toml @@ -0,0 +1,3 @@ +[workspace] +resolver = "2" +members = ["app", "derive", "macro_only_dep", "shared"] diff --git a/cargo-auditable/tests/fixtures/proc_macro_dependency/app/Cargo.toml b/cargo-auditable/tests/fixtures/proc_macro_dependency/app/Cargo.toml new file mode 100644 index 0000000..b4dcdb6 --- /dev/null +++ b/cargo-auditable/tests/fixtures/proc_macro_dependency/app/Cargo.toml @@ -0,0 +1,8 @@ +[package] +name = "app" +version = "0.1.0" +edition = "2021" + +[dependencies] +derive = { path = "../derive" } +shared = { path = "../shared" } diff --git a/cargo-auditable/tests/fixtures/proc_macro_dependency/app/src/main.rs b/cargo-auditable/tests/fixtures/proc_macro_dependency/app/src/main.rs new file mode 100644 index 0000000..f328e4d --- /dev/null +++ b/cargo-auditable/tests/fixtures/proc_macro_dependency/app/src/main.rs @@ -0,0 +1 @@ +fn main() {} diff --git a/cargo-auditable/tests/fixtures/proc_macro_dependency/derive/Cargo.toml b/cargo-auditable/tests/fixtures/proc_macro_dependency/derive/Cargo.toml new file mode 100644 index 0000000..de94413 --- /dev/null +++ b/cargo-auditable/tests/fixtures/proc_macro_dependency/derive/Cargo.toml @@ -0,0 +1,11 @@ +[package] +name = "derive" +version = "0.1.0" +edition = "2021" + +[lib] +proc-macro = true + +[dependencies] +macro_only_dep = { path = "../macro_only_dep" } +shared = { path = "../shared" } diff --git a/cargo-auditable/tests/fixtures/proc_macro_dependency/derive/src/lib.rs b/cargo-auditable/tests/fixtures/proc_macro_dependency/derive/src/lib.rs new file mode 100644 index 0000000..9df5a7a --- /dev/null +++ b/cargo-auditable/tests/fixtures/proc_macro_dependency/derive/src/lib.rs @@ -0,0 +1,8 @@ +extern crate proc_macro; + +use proc_macro::TokenStream; + +#[proc_macro] +pub fn derive(_input: TokenStream) -> TokenStream { + TokenStream::new() +} diff --git a/cargo-auditable/tests/fixtures/proc_macro_dependency/derive/tests/smoke.rs b/cargo-auditable/tests/fixtures/proc_macro_dependency/derive/tests/smoke.rs new file mode 100644 index 0000000..f649de4 --- /dev/null +++ b/cargo-auditable/tests/fixtures/proc_macro_dependency/derive/tests/smoke.rs @@ -0,0 +1,2 @@ +#[test] +fn smoke() {} diff --git a/cargo-auditable/tests/fixtures/proc_macro_dependency/macro_only_dep/Cargo.toml b/cargo-auditable/tests/fixtures/proc_macro_dependency/macro_only_dep/Cargo.toml new file mode 100644 index 0000000..61dfeb7 --- /dev/null +++ b/cargo-auditable/tests/fixtures/proc_macro_dependency/macro_only_dep/Cargo.toml @@ -0,0 +1,4 @@ +[package] +name = "macro_only_dep" +version = "0.1.0" +edition = "2021" diff --git a/cargo-auditable/tests/fixtures/proc_macro_dependency/macro_only_dep/src/lib.rs b/cargo-auditable/tests/fixtures/proc_macro_dependency/macro_only_dep/src/lib.rs new file mode 100644 index 0000000..dfaf506 --- /dev/null +++ b/cargo-auditable/tests/fixtures/proc_macro_dependency/macro_only_dep/src/lib.rs @@ -0,0 +1 @@ +pub fn helper() {} diff --git a/cargo-auditable/tests/fixtures/proc_macro_dependency/shared/Cargo.toml b/cargo-auditable/tests/fixtures/proc_macro_dependency/shared/Cargo.toml new file mode 100644 index 0000000..9f8feeb --- /dev/null +++ b/cargo-auditable/tests/fixtures/proc_macro_dependency/shared/Cargo.toml @@ -0,0 +1,4 @@ +[package] +name = "shared" +version = "0.1.0" +edition = "2021" diff --git a/cargo-auditable/tests/fixtures/proc_macro_dependency/shared/src/lib.rs b/cargo-auditable/tests/fixtures/proc_macro_dependency/shared/src/lib.rs new file mode 100644 index 0000000..c552e13 --- /dev/null +++ b/cargo-auditable/tests/fixtures/proc_macro_dependency/shared/src/lib.rs @@ -0,0 +1 @@ +pub fn runtime() {} diff --git a/cargo-auditable/tests/it.rs b/cargo-auditable/tests/it.rs index b30ce1a..abe1c90 100644 --- a/cargo-auditable/tests/it.rs +++ b/cargo-auditable/tests/it.rs @@ -586,6 +586,48 @@ fn test_proc_macro_inner(sbom: bool) { assert_eq!(syn_info.kind, DependencyKind::Build); } +#[test] +fn test_proc_macro_with_test_target() { + test_proc_macro_with_test_target_inner(false); + test_proc_macro_with_test_target_inner(true); +} + +fn test_proc_macro_with_test_target_inner(sbom: bool) { + // The proc macro crate has an integration test target, so it has more than one target. + // It must still be recorded as a build-time-only dependency. + let workspace_cargo_toml = PathBuf::from(env!("CARGO_MANIFEST_DIR")) + .join("tests/fixtures/proc_macro_dependency/Cargo.toml"); + let bins = run_cargo_auditable(workspace_cargo_toml, &[], &[], sbom); + eprintln!("Proc macro with test target binary map: {bins:?}"); + + let binary = &bins.get("app").unwrap()[0]; + let dep_info = get_dependency_info(binary); + eprintln!("{binary} dependency info: {dep_info:?}"); + + let derive_info = dep_info + .packages + .iter() + .find(|p| p.name == "derive") + .expect("Could not find 'derive' in the embedded dependency list!"); + assert_eq!(derive_info.kind, DependencyKind::Build); + + // Dependencies only reachable through the proc macro are also build-time-only. + let macro_only_dep_info = dep_info + .packages + .iter() + .find(|p| p.name == "macro_only_dep") + .expect("Could not find 'macro_only_dep' in the embedded dependency list!"); + assert_eq!(macro_only_dep_info.kind, DependencyKind::Build); + + // A dependency used by both the app and the proc macro remains a runtime dependency. + let shared_info = dep_info + .packages + .iter() + .find(|p| p.name == "shared") + .expect("Could not find 'shared' in the embedded dependency list!"); + assert_eq!(shared_info.kind, DependencyKind::Runtime); +} + #[test] fn test_bare_linker() { test_bare_linker_inner(false);