Skip to content

feat: add support for specifying rustfmt --edition flag via generator options #129

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
merged 1 commit into from
Oct 20, 2025
Merged

feat: add support for specifying rustfmt --edition flag via generator options #129

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
6 changes: 5 additions & 1 deletion varlink_generator/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,7 @@ pub struct GeneratorOptions {
pub string_type: Option<&'static str>,
pub preamble: Option<TokenStream>,
pub generate_async: bool,
pub fmt_edition: Option<&'static str>,
}

impl<'short, 'long: 'short> ToRustString<'short, 'long> for VType<'long> {
Expand Down Expand Up @@ -1317,6 +1318,7 @@ pub fn cargo_build_tosource<T: AsRef<Path> + ?Sized>(input_path: &T, rustfmt: bo
/// true,
/// &varlink_generator::GeneratorOptions {
/// int_type: Some("i128"),
/// fmt_edition: Some("2021"),
/// ..Default::default()
/// },
/// );
Expand Down Expand Up @@ -1368,8 +1370,10 @@ pub fn cargo_build_tosource_options<T: AsRef<Path> + ?Sized>(
}

if rustfmt {
let edition = options.fmt_edition.unwrap_or("2018");
if let Err(e) = Command::new("rustfmt")
.arg("--edition=2018")
.arg("--edition")
.arg(edition)
.arg(rust_path.to_str().unwrap())
.output()
{
Expand Down
Loading