itsscb/cargo
1
0
Fork 0
mirror of https://github.com/rust-lang/cargo.git synced 2025-09-28 11:20:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor(manifest): Make env macro as minimal as possible

Browse Source 
Macros add a lot of code complexity.  This tries to reduce it by making
the macro do the bare minimum possible.

This does cause some extra branching (unless its compiled out) but that
shouldn't be prohibitive.
This commit is contained in:
Ed Page 2025-01-02 15:03:11 -06:00
parent b16514de3b
commit 711d6bef36
1 changed files with 11 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/cargo/core/manifest.rs
View File

@ -156,42 +156,25 @@ macro_rules! get_metadata_env {
};
}
struct MetadataEnvs;
macro_rules! metadata_envs {
(
$(
($field:ident, $key:literal$(, $to_var:expr)?),
)*
) => {
struct MetadataEnvs;
impl MetadataEnvs {
$(
fn $field(meta: &ManifestMetadata) -> Cow<'_, str> {
get_metadata_env!(meta, $field$(, $to_var)?)
}
)*
pub fn should_track(key: &str) -> bool {
let keys = [$($key),*];
keys.iter().any(|k| *k == key)
fn keys() -> &'static [&'static str] {
&[$($key),*]
}
pub fn var<'a>(meta: &'a ManifestMetadata, key: &str) -> Option<Cow<'a, str>> {
fn var<'a>(meta: &'a ManifestMetadata, key: &str) -> Option<Cow<'a, str>> {
match key {
$($key => Some(Self::$field(meta)),)*
$($key => Some(get_metadata_env!(meta, $field$(, $to_var)?)),)*
_ => None,
}
}
pub fn vars(meta: &ManifestMetadata) -> impl Iterator<Item = (&'static str, Cow<'_, str>)> {
[
$(
(
$key,
Self::$field(meta),
),
)*
].into_iter()
}
}
}
}
@ -213,7 +196,8 @@ metadata_envs! {
impl ManifestMetadata {
/// Whether the given env var should be tracked by Cargo's dep-info.
pub fn should_track(env_key: &str) -> bool {
MetadataEnvs::should_track(env_key)
let keys = MetadataEnvs::keys();
keys.iter().any(|k| *k == env_key)
}
pub fn env_var<'a>(&'a self, env_key: &str) -> Option<Cow<'a, str>> {
@ -221,7 +205,9 @@ impl ManifestMetadata {
}
pub fn env_vars(&self) -> impl Iterator<Item = (&'static str, Cow<'_, str>)> {
MetadataEnvs::vars(self)
MetadataEnvs::keys()
.iter()
.map(|k| (*k, MetadataEnvs::var(self, k).unwrap()))
}
}