diff --git a/xso-proc/src/compound.rs b/xso-proc/src/compound.rs index 4a230c76b966b37e479ce47a97ea31a1724ab611..e282c941939f365ab582d606a42e4d2e15688fdc 100644 --- a/xso-proc/src/compound.rs +++ b/xso-proc/src/compound.rs @@ -287,11 +287,11 @@ impl Compound { // that in version 1.86, but that was rolled back. let attr_a = attr_a.replace('{', "{{").replace('}', "}}"); let attr_b = attr_b.replace('{', "{{").replace('}', "}}"); - let field_a = FieldName(&member_a) + let field_a = FieldName(member_a) .to_string() .replace('{', "{{") .replace('}', "}}"); - let field_b = FieldName(&member_b) + let field_b = FieldName(member_b) .to_string() .replace('{', "{{") .replace('}', "}}"); diff --git a/xso/ChangeLog b/xso/ChangeLog index 0567bc28d836f637a1fe5caba486a3288084f40e..3ec3023e6fdc2d10c50dc2aa714ad8f8af3b1e93 100644 --- a/xso/ChangeLog +++ b/xso/ChangeLog @@ -1,4 +1,6 @@ Version NEXT: + * Changes + - Fix some Clippy warnings Version 0.3.0, release 2025-10-28: * Changes diff --git a/xso/src/dynxso.rs b/xso/src/dynxso.rs index debba090c7e8f7ffa006927d2ec46632e69fbd45..63f54df8b5cd28965c52e09d6f7cf812e699951b 100644 --- a/xso/src/dynxso.rs +++ b/xso/src/dynxso.rs @@ -408,6 +408,13 @@ pub struct BuilderRegistry { inner: Mutex>>, } +#[cfg(feature = "std")] +impl Default for BuilderRegistry { + fn default() -> Self { + Self::new() + } +} + #[cfg(feature = "std")] impl BuilderRegistry { /// Create an empty registry. @@ -465,7 +472,7 @@ impl BuilderRegistry { } fn try_build( - inner: &mut Vec>, + inner: &mut [BuilderRegistryEntry], mut name: rxml::QName, mut attrs: rxml::AttrMap, ctx: &Context<'_>, @@ -548,7 +555,7 @@ impl DynXsoRegistryLookup for BuilderRegistry { ctx: &Context<'_>, ) -> Result>>, FromEventsError> { let mut inner = self.inner.lock().unwrap(); - let (name, attrs) = match Self::try_build(&mut *inner, name, attrs, ctx, |qname| { + let (name, attrs) = match Self::try_build(&mut inner, name, attrs, ctx, |qname| { XmlNameMatcher::Specific(qname.0.as_str(), qname.1.as_str()) }) { Ok(v) => return Ok(v), @@ -556,7 +563,7 @@ impl DynXsoRegistryLookup for BuilderRegistry { Err(FromEventsError::Mismatch { name, attrs }) => (name, attrs), }; - let (name, attrs) = match Self::try_build(&mut *inner, name, attrs, ctx, |qname| { + let (name, attrs) = match Self::try_build(&mut inner, name, attrs, ctx, |qname| { XmlNameMatcher::InNamespace(qname.0.as_str()) }) { Ok(v) => return Ok(v), @@ -564,7 +571,7 @@ impl DynXsoRegistryLookup for BuilderRegistry { Err(FromEventsError::Mismatch { name, attrs }) => (name, attrs), }; - Self::try_build(&mut *inner, name, attrs, ctx, |_| XmlNameMatcher::Any) + Self::try_build(&mut inner, name, attrs, ctx, |_| XmlNameMatcher::Any) } } @@ -1298,7 +1305,7 @@ impl XsoVec { { let iter = match self.inner.get(&TypeId::of::()) { Some(v) => v.deref().iter(), - None => (&[]).iter(), + None => [].iter(), }; // UNWRAP: We group the values by TypeId, so the downcast should never // fail, but I am too chicken to use the unchecked variants :). @@ -1335,7 +1342,7 @@ impl XsoVec { { let iter = match self.inner.get_mut(&TypeId::of::()) { Some(v) => v.deref_mut().iter_mut(), - None => (&mut []).iter_mut(), + None => [].iter_mut(), }; // UNWRAP: We group the values by TypeId, so the downcast should never // fail, but I am too chicken to use the unchecked variants :). diff --git a/xso/src/fromxml.rs b/xso/src/fromxml.rs index 230c43a7b69b8f3cdb2b0d571011994c2bc9cd21..5e1c0051f08d2c501e0b2fb73dd632e1f043c759 100644 --- a/xso/src/fromxml.rs +++ b/xso/src/fromxml.rs @@ -112,7 +112,7 @@ impl<'x> Context<'x> { /// Return the `xml:lang` value in effect at the end of the event which /// is currently being processed. pub fn language(&self) -> Option<&str> { - self.language.as_deref() + self.language } }