xmppftw/xmpp-rs
Watch
1
0
Fork
You've already forked xmpp-rs
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

xso-proc: fix renaming attributes using a static item

Browse source 
This was broken by d4d520e by accident, and of course we didn't have
tests for that :-).

(we do, now)
This commit is contained in:
Jonas Schäfer 2024-06-24 14:41:43 +02:00
commit c0d109d9be
2 changed files with 27 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

33
xso-proc/src/meta.rs
View file

@ -207,6 +207,12 @@ impl XmlCompoundMeta {
fn parse_prefixed_name(
value: syn::parse::ParseStream<'_>,
) -> Result<(Option<NamespaceRef>, NameRef)> {
if !value.peek(LitStr) {
// if we don't have a string literal next, we delegate to the default
// `NameRef` parser.
return Ok((None, value.parse()?));
}
let name: LitStr = value.parse()?;
let name_span = name.span();
let (prefix, name) = match name
@ -284,23 +290,18 @@ impl XmlFieldMeta {
return Err(Error::new_spanned(meta.path, "duplicate `name` key"));
}
let value = meta.value()?;
name = if value.peek(LitStr) {
let name_span = value.span();
let (new_namespace, name) = parse_prefixed_name(value)?;
if let Some(new_namespace) = new_namespace {
if namespace.is_some() {
return Err(Error::new(
name_span,
"cannot combine `namespace` key with prefixed `name`",
));
}
namespace = Some(new_namespace);
let name_span = value.span();
let (new_namespace, new_name) = parse_prefixed_name(value)?;
if let Some(new_namespace) = new_namespace {
if namespace.is_some() {
return Err(Error::new(
name_span,
"cannot combine `namespace` key with prefixed `name`",
));
}
Some(name)
} else {
// just use the normal parser
Some(value.parse()?)
};
namespace = Some(new_namespace);
}
name = Some(new_name);
Ok(())
} else if meta.path.is_ident("namespace") {
if namespace.is_some() {