feat(core)!: Lifetime API improvements in ExpandedName and QName. (#134)

Author: lukasfri

xmlity-quick-xml/src/de.rs

@@ -567,7 +567,7 @@ impl Drop for SubAttributesAccess<'_, '_> {
 }
 
 fn key_is_declaration(key: &ExpandedName) -> bool {
-    key.namespace() == Some(&XmlNamespace::XMLNS)
+    *key.namespace() == Some(XmlNamespace::XMLNS)
         || (key.local_name() == &LocalName::new_dangerous("xmlns") && key.namespace().is_none())
 }
 

xmlity/src/lib.rs

@@ -136,13 +136,23 @@ impl<'a> ExpandedName<'a> {
     }
 
     /// Returns the local name of this [`ExpandedName`].
-    pub fn local_name(&self) -> &LocalName<'_> {
+    pub fn local_name(&self) -> &LocalName<'a> {
         &self.local_name
     }
 
+    /// Returns a mutable reference to the local name of this [`ExpandedName`].
+    pub fn local_name_mut(&mut self) -> &mut LocalName<'a> {
+        &mut self.local_name
+    }
+
     /// Returns the namespace of this [`ExpandedName`].
-    pub fn namespace(&self) -> Option<&XmlNamespace<'_>> {
-        self.namespace.as_ref()
+    pub fn namespace(&self) -> &Option<XmlNamespace<'a>> {
+        &self.namespace
+    }
+
+    /// Returns a mutable reference to the namespace of this [`ExpandedName`].
+    pub fn namespace_mut(&mut self) -> &mut Option<XmlNamespace<'a>> {
+        &mut self.namespace
     }
 
     /// Converts this [`ExpandedName`] into a [`QName`] name using the given [`Prefix`].
@@ -210,14 +220,24 @@ impl<'a> QName<'a> {
     }
 
     /// Returns the [`Prefix`] of this [`QName`].
-    pub fn prefix(&self) -> Option<&Prefix<'a>> {
-        self.prefix.as_ref()
+    pub fn prefix(&self) -> &Option<Prefix<'a>> {
+        &self.prefix
+    }
+
+    /// Returns a mutable reference to the [`Prefix`] of this [`QName`].
+    pub fn prefix_mut(&mut self) -> &mut Option<Prefix<'a>> {
+        &mut self.prefix
     }
 
     /// Returns the [`LocalName`] of this [`QName`].
     pub fn local_name(&self) -> &LocalName<'a> {
         &self.local_name
     }
+
+    /// Returns a mutable reference to the [`LocalName`] of this [`QName`].
+    pub fn local_name_mut(&mut self) -> &mut LocalName<'a> {
+        &mut self.local_name
+    }
 }
 
 impl Display for QName<'_> {
@@ -571,7 +591,7 @@ mod tests {
         let local_name = LocalName::from_str(local_name_text).unwrap();
         let expanded_name = ExpandedName::new(local_name.clone(), namespace.clone());
         assert_eq!(expanded_name.local_name(), &local_name);
-        assert_eq!(expanded_name.namespace(), namespace.as_ref());
+        assert_eq!(expanded_name.namespace(), &namespace);
         assert_eq!(expanded_name.to_string(), local_name_text);
         assert_eq!(expanded_name.into_owned().to_string(), local_name_text);
     }