robin/bitbuffer
1
0
Fork 0
mirror of https://codeberg.org/icewind/bitbuffer.git synced 2026-06-04 00:54:07 +02:00
Code Issues Releases Wiki Activity

derive: dont try to parse attributes from outside the crate

Browse source
This commit is contained in:
Robin Appelman 2024-11-13 20:47:47 +01:00
commit d6ea837c4e
4 changed files with 14 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

19
bitbuffer_derive/src/params/mod.rs
View file

@ -260,11 +260,9 @@ const BARE_ATTRS: &[&str] = &[
fn parse_attrs<T: Parse + Default + Merge>(attrs: &[Attribute]) -> Result<T> {
let mut result = T::default();
for attr in attrs {
let parsed = if BARE_ATTRS
.iter()
.any(|name| attr.meta.path().is_ident(name))
{
for attr in attrs.iter() {
let attr_path = attr.meta.path();
let parsed = if BARE_ATTRS.iter().any(|name| attr_path.is_ident(name)) {
let wrapped_meta = Meta::List(MetaList {
path: parse_str("bitbuffer").unwrap(),
delimiter: MacroDelimiter::Paren(Paren {
@ -278,15 +276,17 @@ fn parse_attrs<T: Parse + Default + Merge>(attrs: &[Attribute]) -> Result<T> {
bracket_token: attr.bracket_token,
meta: wrapped_meta,
};
wrapped.parse_args()
Some(wrapped.parse_args())
} else if attr_path.is_ident("bitbuffer") {
Some(attr.parse_args())
} else {
attr.parse_args()
None
};
match parsed {
Ok(parsed) => {
Some(Ok(parsed)) => {
result.merge(parsed);
}
Err(e) => {
Some(Err(e)) => {
// since we first parse our attrs as InputAttrs, and then the same attrs as either an Struct or EnumAttrs
// when doing the first pass we expect a bunch of extra parameters
let is_first_pass = type_name::<T>() == type_name::<InputAttrs>();
@ -294,6 +294,7 @@ fn parse_attrs<T: Parse + Default + Merge>(attrs: &[Attribute]) -> Result<T> {
return Err(e);
}
}
None => {}
}
}
Ok(result)