pep/xmpp-rs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Change prefix fn to return Option<&str>

Browse source
This commit is contained in:
Maxime “pep” Buquet 2017-12-31 15:24:28 +00:00
parent 9c498044ee
commit db70487a31
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/element.rs
View file

@ -201,10 +201,10 @@ impl Element {
/// .build(); /// .build();
/// ///
/// assert_eq!(elem.name(), "name"); /// assert_eq!(elem.name(), "name");
/// assert_eq!(elem.prefix(), Some("prefix".to_owned())); /// assert_eq!(elem.prefix(), Some("prefix"));
/// ``` /// ```
pub fn prefix(&self) -> Option<String> { pub fn prefix(&self) -> Option<&str> {
self.prefix.clone() self.prefix.as_ref().map(String::as_ref)
} }
/// Returns a reference to the namespace of this element, if it has one, else `None`. /// Returns a reference to the namespace of this element, if it has one, else `None`.
@ -335,7 +335,7 @@ impl Element {
let elem = stack.pop().unwrap(); let elem = stack.pop().unwrap();
if let Some(to) = stack.last_mut() { if let Some(to) = stack.last_mut() {
let name = match elem.prefix() { let name = match elem.prefix() {
Some(ref prefix) => format!("{}:", prefix.clone()), Some(ref prefix) => format!("{}:", prefix),
None => String::from(""), None => String::from(""),
} + elem.name(); } + elem.name();
if name.as_bytes() != e.name() { if name.as_bytes() != e.name() {