Skip to content

Commit

Permalink
Shuffle a few more modules around.
Browse files Browse the repository at this point in the history
  • Loading branch information
de-vri-es committed Dec 13, 2023
1 parent 5a21856 commit 3ff2e6d
Show file tree
Hide file tree
Showing 4 changed files with 167 additions and 198 deletions.
67 changes: 67 additions & 0 deletions git-version-macro/src/args.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,67 @@
use syn::{LitStr, Expr, Ident};
use syn::punctuated::Punctuated;
use syn::token::Comma;

#[derive(Default)]
pub struct Args {
pub git_args: Option<Punctuated<LitStr, Comma>>,
pub prefix: Option<Expr>,
pub suffix: Option<Expr>,
pub cargo_prefix: Option<Expr>,
pub cargo_suffix: Option<Expr>,
pub fallback: Option<Expr>,
}

impl syn::parse::Parse for Args {
fn parse(input: syn::parse::ParseStream) -> syn::Result<Self> {
let mut result = Args::default();
loop {
if input.is_empty() {
break;
}
let ident: Ident = input.parse()?;
let _: syn::token::Eq = input.parse()?;
let check_dup = |dup: bool| {
if dup {
Err(error!("`{} = ` can only appear once", ident))
} else {
Ok(())
}
};
match ident.to_string().as_str() {
"args" => {
check_dup(result.git_args.is_some())?;
let content;
syn::bracketed!(content in input);
result.git_args = Some(Punctuated::parse_terminated(&content)?);
}
"prefix" => {
check_dup(result.prefix.is_some())?;
result.prefix = Some(input.parse()?);
}
"suffix" => {
check_dup(result.suffix.is_some())?;
result.suffix = Some(input.parse()?);
}
"cargo_prefix" => {
check_dup(result.cargo_prefix.is_some())?;
result.cargo_prefix = Some(input.parse()?);
}
"cargo_suffix" => {
check_dup(result.cargo_suffix.is_some())?;
result.cargo_suffix = Some(input.parse()?);
}
"fallback" => {
check_dup(result.fallback.is_some())?;
result.fallback = Some(input.parse()?);
}
x => Err(error!("Unexpected argument name `{}`", x))?,
}
if input.is_empty() {
break;
}
let _: Comma = input.parse()?;
}
Ok(result)
}
}
80 changes: 0 additions & 80 deletions git-version-macro/src/describe_submodules.rs

This file was deleted.

Loading

0 comments on commit 3ff2e6d

Please sign in to comment.