Skip to content

compiletest: Parse aux proc-macro directive into struct #151670

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rust-bors merged 1 commit into from
Jan 26, 2026
+18 −7
Merged

compiletest: Parse aux proc-macro directive into struct #151670

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 15 additions & 4 deletions src/tools/compiletest/src/directives/auxiliary.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,13 @@ pub struct AuxCrate {
pub path: String,
}

/// The value of a `proc-macro` directive.
#[derive(Clone, Debug, Default)]
Copy link
Member

@Zalathar Zalathar Jan 26, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Remark: These structs shouldn't actually need to be Default, but I'm fine with merging this as-is (since it matches the others) and then fixing all of them in a separate follow-up PR.

pub(crate) struct ProcMacro {
/// With `proc-macro: bar.rs` this will be `bar.rs`.
pub path: String,
}

/// Properties parsed from `aux-*` test directives.
#[derive(Clone, Debug, Default)]
pub(crate) struct AuxProps {
Expand All @@ -37,7 +44,7 @@ pub(crate) struct AuxProps {
/// to build and pass with the `--extern` flag.
pub(crate) crates: Vec<AuxCrate>,
/// Same as `builds`, but for proc-macros.
pub(crate) proc_macros: Vec<String>,
pub(crate) proc_macros: Vec<ProcMacro>,
/// Similar to `builds`, but also uses the resulting dylib as a
/// `-Zcodegen-backend` when compiling the test file.
pub(crate) codegen_backend: Option<String>,
Expand All @@ -53,7 +60,7 @@ impl AuxProps {
.chain(builds.iter().map(String::as_str))
.chain(bins.iter().map(String::as_str))
.chain(crates.iter().map(|c| c.path.as_str()))
.chain(proc_macros.iter().map(String::as_str))
.chain(proc_macros.iter().map(|p| p.path.as_str()))
.chain(codegen_backend.iter().map(String::as_str))
}
}
Expand All @@ -74,8 +81,8 @@ pub(super) fn parse_and_update_aux(
config.push_name_value_directive(ln, AUX_BUILD, &mut aux.builds, |r| r.trim().to_string());
config.push_name_value_directive(ln, AUX_BIN, &mut aux.bins, |r| r.trim().to_string());
config.push_name_value_directive(ln, AUX_CRATE, &mut aux.crates, parse_aux_crate);
config
.push_name_value_directive(ln, PROC_MACRO, &mut aux.proc_macros, |r| r.trim().to_string());
config.push_name_value_directive(ln, PROC_MACRO, &mut aux.proc_macros, parse_proc_macro);

if let Some(r) = config.parse_name_value_directive(ln, AUX_CODEGEN_BACKEND) {
aux.codegen_backend = Some(r.trim().to_owned());
}
Expand All @@ -99,3 +106,7 @@ fn parse_aux_crate(r: String) -> AuxCrate {

AuxCrate { extern_modifiers: modifiers, name, path }
}

fn parse_proc_macro(r: String) -> ProcMacro {
ProcMacro { path: r.trim().to_string() }
}
6 changes: 3 additions & 3 deletions src/tools/compiletest/src/runtest.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1298,13 +1298,13 @@ impl<'test> TestCx<'test> {
}

for proc_macro in &self.props.aux.proc_macros {
self.build_auxiliary(proc_macro, &aux_dir, Some(AuxType::ProcMacro));
let crate_name = path_to_crate_name(proc_macro);
self.build_auxiliary(&proc_macro.path, &aux_dir, Some(AuxType::ProcMacro));
let crate_name = path_to_crate_name(&proc_macro.path);
add_extern(
rustc,
None, // `extern_modifiers`
&crate_name,
proc_macro,
&proc_macro.path,
AuxType::ProcMacro,
);
}
Expand Down
Loading