diff --git a/src/attention.rs b/src/attention.rs
index e71b26446f9a2335c5a548b04aad51de44edd5a0..be33bb3b6f07d002163bfa2ee46d4f3a7bc6b6c3 100644
--- a/src/attention.rs
+++ b/src/attention.rs
@@ -8,7 +8,9 @@ use crate::message::MessagePayload;
generate_empty_element!(
/// Requests the attention of the recipient.
- Attention, "attention", ATTENTION
+ Attention,
+ "attention",
+ ATTENTION
);
impl MessagePayload for Attention {}
@@ -16,9 +18,9 @@ impl MessagePayload for Attention {}
#[cfg(test)]
mod tests {
use super::*;
- use try_from::TryFrom;
- use minidom::Element;
use crate::error::Error;
+ use minidom::Element;
+ use try_from::TryFrom;
#[test]
fn test_size() {
@@ -33,7 +35,9 @@ mod tests {
#[test]
fn test_invalid_child() {
- let elem: Element = "".parse().unwrap();
+ let elem: Element = ""
+ .parse()
+ .unwrap();
let error = Attention::try_from(elem).unwrap_err();
let message = match error {
Error::ParseError(string) => string,
@@ -44,7 +48,9 @@ mod tests {
#[test]
fn test_invalid_attribute() {
- let elem: Element = "".parse().unwrap();
+ let elem: Element = ""
+ .parse()
+ .unwrap();
let error = Attention::try_from(elem).unwrap_err();
let message = match error {
Error::ParseError(string) => string,
diff --git a/src/bind.rs b/src/bind.rs
index 81187ae3e76123b369d065448c5fe2e0045c1c98..ddda0392b67b2105977923cf0f47e62a4dbf8e75 100644
--- a/src/bind.rs
+++ b/src/bind.rs
@@ -4,15 +4,13 @@
// License, v. 2.0. If a copy of the MPL was not distributed with this
// file, You can obtain one at http://mozilla.org/MPL/2.0/.
-use std::str::FromStr;
-use try_from::TryFrom;
-
-use minidom::Element;
-
use crate::error::Error;
-use jid::Jid;
+use crate::iq::{IqResultPayload, IqSetPayload};
use crate::ns;
-use crate::iq::{IqSetPayload, IqResultPayload};
+use jid::Jid;
+use minidom::Element;
+use std::str::FromStr;
+use try_from::TryFrom;
/// The request for resource binding, which is the process by which a client
/// can obtain a full JID and start exchanging on the XMPP network.
@@ -74,23 +72,16 @@ impl TryFrom for Bind {
impl From for Element {
fn from(bind: Bind) -> Element {
Element::builder("bind")
- .ns(ns::BIND)
- .append(match bind {
- Bind::None => vec!(),
- Bind::Resource(resource) => vec!(
- Element::builder("resource")
- .ns(ns::BIND)
- .append(resource)
- .build()
- ),
- Bind::Jid(jid) => vec!(
- Element::builder("jid")
- .ns(ns::BIND)
- .append(jid)
- .build()
- ),
- })
- .build()
+ .ns(ns::BIND)
+ .append(match bind {
+ Bind::None => vec![],
+ Bind::Resource(resource) => vec![Element::builder("resource")
+ .ns(ns::BIND)
+ .append(resource)
+ .build()],
+ Bind::Jid(jid) => vec![Element::builder("jid").ns(ns::BIND).append(jid).build()],
+ })
+ .build()
}
}
@@ -112,7 +103,9 @@ mod tests {
#[test]
fn test_simple() {
- let elem: Element = "".parse().unwrap();
+ let elem: Element = ""
+ .parse()
+ .unwrap();
let bind = Bind::try_from(elem).unwrap();
assert_eq!(bind, Bind::None);
}
diff --git a/src/blocking.rs b/src/blocking.rs
index fd89c4846e38b2562ebf23ee0e5458aac46cb361..d34fee3d97a1935c5d825e7bfc836408e74885a2 100644
--- a/src/blocking.rs
+++ b/src/blocking.rs
@@ -4,20 +4,19 @@
// License, v. 2.0. If a copy of the MPL was not distributed with this
// file, You can obtain one at http://mozilla.org/MPL/2.0/.
-use try_from::TryFrom;
-
-use jid::Jid;
-use minidom::Element;
-
use crate::error::Error;
-
+use crate::iq::{IqGetPayload, IqResultPayload, IqSetPayload};
use crate::ns;
-use crate::iq::{IqGetPayload, IqSetPayload, IqResultPayload};
+use jid::Jid;
+use minidom::Element;
+use try_from::TryFrom;
generate_empty_element!(
/// The element requesting the blocklist, the result iq will contain a
/// [BlocklistResult].
- BlocklistRequest, "blocklist", BLOCKING
+ BlocklistRequest,
+ "blocklist",
+ BLOCKING
);
impl IqGetPayload for BlocklistRequest {}
@@ -67,7 +66,8 @@ macro_rules! generate_blocking_element {
generate_blocking_element!(
/// The element containing the current blocklist, as a reply from
/// [BlocklistRequest].
- BlocklistResult, "blocklist"
+ BlocklistResult,
+ "blocklist"
);
impl IqResultPayload for BlocklistResult {}
@@ -75,7 +75,8 @@ impl IqResultPayload for BlocklistResult {}
// TODO: Prevent zero elements from being allowed.
generate_blocking_element!(
/// A query to block one or more JIDs.
- Block, "block"
+ Block,
+ "block"
);
impl IqSetPayload for Block {}
@@ -84,14 +85,17 @@ generate_blocking_element!(
/// A query to unblock one or more JIDs, or all of them.
///
/// Warning: not putting any JID there means clearing out the blocklist.
- Unblock, "unblock"
+ Unblock,
+ "unblock"
);
impl IqSetPayload for Unblock {}
generate_empty_element!(
/// The application-specific error condition when a message is blocked.
- Blocked, "blocked", BLOCKING_ERRORS
+ Blocked,
+ "blocked",
+ BLOCKING_ERRORS
);
#[cfg(test)]
@@ -138,7 +142,7 @@ mod tests {
#[test]
fn test_items() {
let elem: Element = "-
- ".parse().unwrap();
+ "
+ .parse()
+ .unwrap();
let item = Item::try_from(elem).unwrap();
match item {
- Item { actor, .. } =>
- assert_eq!(actor, Some(Actor::Nick("foobar".to_owned()))),
+ Item { actor, .. } => assert_eq!(actor, Some(Actor::Nick("foobar".to_owned()))),
}
}
#[test]
- fn test_item_role_continue_child(){
+ fn test_item_role_continue_child() {
let elem: Element = "
-
- ".parse().unwrap();
+ "
+ .parse()
+ .unwrap();
let item = Item::try_from(elem).unwrap();
- let continue_1 = Continue { thread: Some("foobar".to_owned()) };
+ let continue_1 = Continue {
+ thread: Some("foobar".to_owned()),
+ };
match item {
- Item { continue_: Some(continue_2), .. } => assert_eq!(continue_2.thread, continue_1.thread),
+ Item {
+ continue_: Some(continue_2),
+ ..
+ } => assert_eq!(continue_2.thread, continue_1.thread),
_ => panic!(),
}
}
#[test]
- fn test_item_role_reason_child(){
+ fn test_item_role_reason_child() {
let elem: Element = "
-
foobar
- ".parse().unwrap();
+ "
+ .parse()
+ .unwrap();
let item = Item::try_from(elem).unwrap();
match item {
- Item { reason, .. } =>
- assert_eq!(reason, Some(Reason("foobar".to_owned()))),
+ Item { reason, .. } => assert_eq!(reason, Some(Reason("foobar".to_owned()))),
}
}
}
diff --git a/src/nick.rs b/src/nick.rs
index 360348bd8761074ce8ff9fa1bad2b51dfaf88982..edf8dcacce17b23e54ac39fcbea32b87aad8d5a2 100644
--- a/src/nick.rs
+++ b/src/nick.rs
@@ -6,15 +6,17 @@
generate_elem_id!(
/// Represents a global, memorable, friendly or informal name chosen by a user.
- Nick, "nick", NICK
+ Nick,
+ "nick",
+ NICK
);
#[cfg(test)]
mod tests {
use super::*;
- use try_from::TryFrom;
- use minidom::Element;
use crate::error::Error;
+ use minidom::Element;
+ use try_from::TryFrom;
#[cfg(target_pointer_width = "32")]
#[test]
@@ -30,7 +32,9 @@ mod tests {
#[test]
fn test_simple() {
- let elem: Element = "Link Mauve".parse().unwrap();
+ let elem: Element = "Link Mauve"
+ .parse()
+ .unwrap();
let nick = Nick::try_from(elem).unwrap();
assert_eq!(&nick.0, "Link Mauve");
}
@@ -38,13 +42,17 @@ mod tests {
#[test]
fn test_serialise() {
let elem1 = Element::from(Nick(String::from("Link Mauve")));
- let elem2: Element = "Link Mauve".parse().unwrap();
+ let elem2: Element = "Link Mauve"
+ .parse()
+ .unwrap();
assert_eq!(elem1, elem2);
}
#[test]
fn test_invalid() {
- let elem: Element = "".parse().unwrap();
+ let elem: Element = ""
+ .parse()
+ .unwrap();
let error = Nick::try_from(elem).unwrap_err();
let message = match error {
Error::ParseError(string) => string,
@@ -55,7 +63,9 @@ mod tests {
#[test]
fn test_invalid_attribute() {
- let elem: Element = "".parse().unwrap();
+ let elem: Element = ""
+ .parse()
+ .unwrap();
let error = Nick::try_from(elem).unwrap_err();
let message = match error {
Error::ParseError(string) => string,
diff --git a/src/ping.rs b/src/ping.rs
index ddb636d3f3fa91d6b7c7883202acd83e14f8bc24..4cb25f649c453db84f9879f5871c743df187898f 100644
--- a/src/ping.rs
+++ b/src/ping.rs
@@ -10,7 +10,9 @@ use crate::iq::IqGetPayload;
generate_empty_element!(
/// Represents a ping to the recipient, which must be answered with an
/// empty `` or with an error.
- Ping, "ping", PING
+ Ping,
+ "ping",
+ PING
);
impl IqGetPayload for Ping {}
@@ -18,9 +20,9 @@ impl IqGetPayload for Ping {}
#[cfg(test)]
mod tests {
use super::*;
- use try_from::TryFrom;
- use minidom::Element;
use crate::error::Error;
+ use minidom::Element;
+ use try_from::TryFrom;
#[test]
fn test_size() {
@@ -42,7 +44,9 @@ mod tests {
#[test]
fn test_invalid() {
- let elem: Element = "".parse().unwrap();
+ let elem: Element = ""
+ .parse()
+ .unwrap();
let error = Ping::try_from(elem).unwrap_err();
let message = match error {
Error::ParseError(string) => string,
diff --git a/src/presence.rs b/src/presence.rs
index aece0cff7c25c83db0b216c5f5a2e779d20d422e..8f3d2cf109a806ab68600cb12caa159412255553 100644
--- a/src/presence.rs
+++ b/src/presence.rs
@@ -5,11 +5,11 @@
// License, v. 2.0. If a copy of the MPL was not distributed with this
// file, You can obtain one at http://mozilla.org/MPL/2.0/.
-use try_from::TryFrom;
-use std::str::FromStr;
use std::collections::BTreeMap;
+use std::str::FromStr;
+use try_from::TryFrom;
-use minidom::{Element, IntoElements, IntoAttributeValue, ElementEmitter};
+use minidom::{Element, ElementEmitter, IntoAttributeValue, IntoElements};
use jid::Jid;
@@ -68,14 +68,15 @@ impl IntoElements for Show {
}
emitter.append_child(
Element::builder("show")
- .append(match self {
- Show::None => unreachable!(),
- Show::Away => Some("away"),
- Show::Chat => Some("chat"),
- Show::Dnd => Some("dnd"),
- Show::Xa => Some("xa"),
- })
- .build())
+ .append(match self {
+ Show::None => unreachable!(),
+ Show::Away => Some("away"),
+ Show::Chat => Some("chat"),
+ Show::Dnd => Some("dnd"),
+ Show::Xa => Some("xa"),
+ })
+ .build(),
+ )
}
}
@@ -84,7 +85,7 @@ type Status = String;
type Priority = i8;
-///
+///
#[derive(Debug, Clone, PartialEq)]
pub enum Type {
/// This value is not an acceptable 'type' attribute, it is only used
@@ -136,24 +137,31 @@ impl FromStr for Type {
"unsubscribe" => Type::Unsubscribe,
"unsubscribed" => Type::Unsubscribed,
- _ => return Err(Error::ParseError("Invalid 'type' attribute on presence element.")),
+ _ => {
+ return Err(Error::ParseError(
+ "Invalid 'type' attribute on presence element.",
+ ))
+ }
})
}
}
impl IntoAttributeValue for Type {
fn into_attribute_value(self) -> Option {
- Some(match self {
- Type::None => return None,
-
- Type::Error => "error",
- Type::Probe => "probe",
- Type::Subscribe => "subscribe",
- Type::Subscribed => "subscribed",
- Type::Unavailable => "unavailable",
- Type::Unsubscribe => "unsubscribe",
- Type::Unsubscribed => "unsubscribed",
- }.to_owned())
+ Some(
+ match self {
+ Type::None => return None,
+
+ Type::Error => "error",
+ Type::Probe => "probe",
+ Type::Subscribe => "subscribe",
+ Type::Subscribed => "subscribed",
+ Type::Unavailable => "unavailable",
+ Type::Unsubscribe => "unsubscribe",
+ Type::Unsubscribed => "unsubscribed",
+ }
+ .to_owned(),
+ )
}
}
@@ -197,7 +205,7 @@ impl Presence {
show: Show::None,
statuses: BTreeMap::new(),
priority: 0i8,
- payloads: vec!(),
+ payloads: vec![],
}
}
@@ -266,12 +274,14 @@ impl TryFrom for Presence {
show: Show::None,
statuses: BTreeMap::new(),
priority: 0i8,
- payloads: vec!(),
+ payloads: vec![],
};
for elem in root.children() {
if elem.is("show", ns::DEFAULT_NS) {
if show.is_some() {
- return Err(Error::ParseError("More than one show element in a presence."));
+ return Err(Error::ParseError(
+ "More than one show element in a presence.",
+ ));
}
check_no_attributes!(elem, "show");
check_no_children!(elem, "show");
@@ -281,11 +291,15 @@ impl TryFrom for Presence {
check_no_children!(elem, "status");
let lang = get_attr!(elem, "xml:lang", default);
if presence.statuses.insert(lang, elem.text()).is_some() {
- return Err(Error::ParseError("Status element present twice for the same xml:lang."));
+ return Err(Error::ParseError(
+ "Status element present twice for the same xml:lang.",
+ ));
}
} else if elem.is("priority", ns::DEFAULT_NS) {
if priority.is_some() {
- return Err(Error::ParseError("More than one priority element in a presence."));
+ return Err(Error::ParseError(
+ "More than one priority element in a presence.",
+ ));
}
check_no_attributes!(elem, "priority");
check_no_children!(elem, "priority");
@@ -307,24 +321,37 @@ impl TryFrom for Presence {
impl From for Element {
fn from(presence: Presence) -> Element {
Element::builder("presence")
- .ns(ns::DEFAULT_NS)
- .attr("from", presence.from)
- .attr("to", presence.to)
- .attr("id", presence.id)
- .attr("type", presence.type_)
- .append(presence.show)
- .append(presence.statuses.into_iter().map(|(lang, status)| {
- Element::builder("status")
- .attr("xml:lang", match lang.as_ref() {
- "" => None,
- lang => Some(lang),
- })
- .append(status)
- .build()
- }).collect::>())
- .append(if presence.priority == 0 { None } else { Some(format!("{}", presence.priority)) })
- .append(presence.payloads)
- .build()
+ .ns(ns::DEFAULT_NS)
+ .attr("from", presence.from)
+ .attr("to", presence.to)
+ .attr("id", presence.id)
+ .attr("type", presence.type_)
+ .append(presence.show)
+ .append(
+ presence
+ .statuses
+ .into_iter()
+ .map(|(lang, status)| {
+ Element::builder("status")
+ .attr(
+ "xml:lang",
+ match lang.as_ref() {
+ "" => None,
+ lang => Some(lang),
+ },
+ )
+ .append(status)
+ .build()
+ })
+ .collect::>(),
+ )
+ .append(if presence.priority == 0 {
+ None
+ } else {
+ Some(format!("{}", presence.priority))
+ })
+ .append(presence.payloads)
+ .build()
}
}
@@ -354,7 +381,9 @@ mod tests {
#[cfg(not(feature = "component"))]
let elem: Element = "".parse().unwrap();
#[cfg(feature = "component")]
- let elem: Element = "".parse().unwrap();
+ let elem: Element = ""
+ .parse()
+ .unwrap();
let presence = Presence::try_from(elem).unwrap();
assert_eq!(presence.from, None);
assert_eq!(presence.to, None);
@@ -366,9 +395,13 @@ mod tests {
#[test]
fn test_serialise() {
#[cfg(not(feature = "component"))]
- let elem: Element = "/>".parse().unwrap();
+ let elem: Element = "/>"
+ .parse()
+ .unwrap();
#[cfg(feature = "component")]
- let elem: Element = "/>".parse().unwrap();
+ let elem: Element = "/>"
+ .parse()
+ .unwrap();
let presence = Presence::new(Type::Unavailable);
let elem2 = presence.into();
assert!(elem.compare_to(&elem2));
@@ -377,9 +410,14 @@ mod tests {
#[test]
fn test_show() {
#[cfg(not(feature = "component"))]
- let elem: Element = "chat".parse().unwrap();
+ let elem: Element = "chat"
+ .parse()
+ .unwrap();
#[cfg(feature = "component")]
- let elem: Element = "chat".parse().unwrap();
+ let elem: Element =
+ "chat"
+ .parse()
+ .unwrap();
let presence = Presence::try_from(elem).unwrap();
assert_eq!(presence.payloads.len(), 0);
assert_eq!(presence.show, Show::Chat);
@@ -388,9 +426,13 @@ mod tests {
#[test]
fn test_missing_show_value() {
#[cfg(not(feature = "component"))]
- let elem: Element = "".parse().unwrap();
+ let elem: Element = ""
+ .parse()
+ .unwrap();
#[cfg(feature = "component")]
- let elem: Element = "".parse().unwrap();
+ let elem: Element = ""
+ .parse()
+ .unwrap();
let error = Presence::try_from(elem).unwrap_err();
let message = match error {
Error::ParseError(string) => string,
@@ -403,9 +445,14 @@ mod tests {
fn test_invalid_show() {
// "online" used to be a pretty common mistake.
#[cfg(not(feature = "component"))]
- let elem: Element = "online".parse().unwrap();
+ let elem: Element = "online"
+ .parse()
+ .unwrap();
#[cfg(feature = "component")]
- let elem: Element = "online".parse().unwrap();
+ let elem: Element =
+ "online"
+ .parse()
+ .unwrap();
let error = Presence::try_from(elem).unwrap_err();
let message = match error {
Error::ParseError(string) => string,
@@ -417,9 +464,13 @@ mod tests {
#[test]
fn test_empty_status() {
#[cfg(not(feature = "component"))]
- let elem: Element = "".parse().unwrap();
+ let elem: Element = ""
+ .parse()
+ .unwrap();
#[cfg(feature = "component")]
- let elem: Element = "".parse().unwrap();
+ let elem: Element = ""
+ .parse()
+ .unwrap();
let presence = Presence::try_from(elem).unwrap();
assert_eq!(presence.payloads.len(), 0);
assert_eq!(presence.statuses.len(), 1);
@@ -429,9 +480,14 @@ mod tests {
#[test]
fn test_status() {
#[cfg(not(feature = "component"))]
- let elem: Element = "Here!".parse().unwrap();
+ let elem: Element = "Here!"
+ .parse()
+ .unwrap();
#[cfg(feature = "component")]
- let elem: Element = "Here!".parse().unwrap();
+ let elem: Element =
+ "Here!"
+ .parse()
+ .unwrap();
let presence = Presence::try_from(elem).unwrap();
assert_eq!(presence.payloads.len(), 0);
assert_eq!(presence.statuses.len(), 1);
@@ -462,15 +518,23 @@ mod tests {
Error::ParseError(string) => string,
_ => panic!(),
};
- assert_eq!(message, "Status element present twice for the same xml:lang.");
+ assert_eq!(
+ message,
+ "Status element present twice for the same xml:lang."
+ );
}
#[test]
fn test_priority() {
#[cfg(not(feature = "component"))]
- let elem: Element = "-1".parse().unwrap();
+ let elem: Element = "-1"
+ .parse()
+ .unwrap();
#[cfg(feature = "component")]
- let elem: Element = "-1".parse().unwrap();
+ let elem: Element =
+ "-1"
+ .parse()
+ .unwrap();
let presence = Presence::try_from(elem).unwrap();
assert_eq!(presence.payloads.len(), 0);
assert_eq!(presence.priority, -1i8);
@@ -479,9 +543,14 @@ mod tests {
#[test]
fn test_invalid_priority() {
#[cfg(not(feature = "component"))]
- let elem: Element = "128".parse().unwrap();
+ let elem: Element = "128"
+ .parse()
+ .unwrap();
#[cfg(feature = "component")]
- let elem: Element = "128".parse().unwrap();
+ let elem: Element =
+ "128"
+ .parse()
+ .unwrap();
let error = Presence::try_from(elem).unwrap_err();
match error {
Error::ParseIntError(_) => (),
@@ -492,9 +561,14 @@ mod tests {
#[test]
fn test_unknown_child() {
#[cfg(not(feature = "component"))]
- let elem: Element = "".parse().unwrap();
+ let elem: Element = ""
+ .parse()
+ .unwrap();
#[cfg(feature = "component")]
- let elem: Element = "".parse().unwrap();
+ let elem: Element =
+ ""
+ .parse()
+ .unwrap();
let presence = Presence::try_from(elem).unwrap();
let payload = &presence.payloads[0];
assert!(payload.is("test", "invalid"));
@@ -503,9 +577,14 @@ mod tests {
#[test]
fn test_invalid_status_child() {
#[cfg(not(feature = "component"))]
- let elem: Element = "".parse().unwrap();
+ let elem: Element = ""
+ .parse()
+ .unwrap();
#[cfg(feature = "component")]
- let elem: Element = "".parse().unwrap();
+ let elem: Element =
+ ""
+ .parse()
+ .unwrap();
let error = Presence::try_from(elem).unwrap_err();
let message = match error {
Error::ParseError(string) => string,
@@ -517,9 +596,14 @@ mod tests {
#[test]
fn test_invalid_attribute() {
#[cfg(not(feature = "component"))]
- let elem: Element = "".parse().unwrap();
+ let elem: Element = ""
+ .parse()
+ .unwrap();
#[cfg(feature = "component")]
- let elem: Element = "".parse().unwrap();
+ let elem: Element =
+ ""
+ .parse()
+ .unwrap();
let error = Presence::try_from(elem).unwrap_err();
let message = match error {
Error::ParseError(string) => string,
diff --git a/src/pubsub/event.rs b/src/pubsub/event.rs
index c1ccace3983e20bbf0da4fcc4a4898ef90c42c43..b8f2bc0066a17dc74c93e345b3a1f035f22d1ad5 100644
--- a/src/pubsub/event.rs
+++ b/src/pubsub/event.rs
@@ -4,19 +4,14 @@
// License, v. 2.0. If a copy of the MPL was not distributed with this
// file, You can obtain one at http://mozilla.org/MPL/2.0/.
-use try_from::TryFrom;
-
-use minidom::Element;
-use jid::Jid;
+use crate::data_forms::DataForm;
use crate::date::DateTime;
-
use crate::error::Error;
-
use crate::ns;
-
-use crate::data_forms::DataForm;
-
-use crate::pubsub::{NodeName, ItemId, Subscription, SubscriptionId};
+use crate::pubsub::{ItemId, NodeName, Subscription, SubscriptionId};
+use jid::Jid;
+use minidom::Element;
+use try_from::TryFrom;
/// One PubSub item from a node.
#[derive(Debug, Clone)]
@@ -40,7 +35,9 @@ impl TryFrom for Item {
let mut payloads = elem.children().cloned().collect::>();
let payload = payloads.pop();
if !payloads.is_empty() {
- return Err(Error::ParseError("More than a single payload in item element."));
+ return Err(Error::ParseError(
+ "More than a single payload in item element.",
+ ));
}
Ok(Item {
payload,
@@ -53,11 +50,11 @@ impl TryFrom for Item {
impl From- for Element {
fn from(item: Item) -> Element {
Element::builder("item")
- .ns(ns::PUBSUB_EVENT)
- .attr("id", item.id)
- .attr("publisher", item.publisher)
- .append(item.payload)
- .build()
+ .ns(ns::PUBSUB_EVENT)
+ .attr("id", item.id)
+ .attr("publisher", item.publisher)
+ .append(item.payload)
+ .build()
}
}
@@ -131,21 +128,29 @@ pub enum PubSubEvent {
fn parse_items(elem: Element, node: NodeName) -> Result {
let mut is_retract = None;
- let mut items = vec!();
- let mut retracts = vec!();
+ let mut items = vec![];
+ let mut retracts = vec![];
for child in elem.children() {
if child.is("item", ns::PUBSUB_EVENT) {
match is_retract {
None => is_retract = Some(false),
Some(false) => (),
- Some(true) => return Err(Error::ParseError("Mix of item and retract in items element.")),
+ Some(true) => {
+ return Err(Error::ParseError(
+ "Mix of item and retract in items element.",
+ ))
+ }
}
items.push(Item::try_from(child.clone())?);
} else if child.is("retract", ns::PUBSUB_EVENT) {
match is_retract {
None => is_retract = Some(true),
Some(true) => (),
- Some(false) => return Err(Error::ParseError("Mix of item and retract in items element.")),
+ Some(false) => {
+ return Err(Error::ParseError(
+ "Mix of item and retract in items element.",
+ ))
+ }
}
check_no_children!(child, "retract");
check_no_unknown_attributes!(child, "retract", ["id"]);
@@ -157,7 +162,10 @@ fn parse_items(elem: Element, node: NodeName) -> Result {
}
Ok(match is_retract {
Some(false) => PubSubEvent::PublishedItems { node, items },
- Some(true) => PubSubEvent::RetractedItems { node, items: retracts },
+ Some(true) => PubSubEvent::RetractedItems {
+ node,
+ items: retracts,
+ },
None => return Err(Error::ParseError("Missing children in items element.")),
})
}
@@ -176,7 +184,9 @@ impl TryFrom for PubSubEvent {
let mut payloads = child.children().cloned().collect::>();
let item = payloads.pop();
if !payloads.is_empty() {
- return Err(Error::ParseError("More than a single payload in configuration element."));
+ return Err(Error::ParseError(
+ "More than a single payload in configuration element.",
+ ));
}
let form = match item {
None => None,
@@ -188,7 +198,9 @@ impl TryFrom for PubSubEvent {
for item in child.children() {
if item.is("redirect", ns::PUBSUB_EVENT) {
if redirect.is_some() {
- return Err(Error::ParseError("More than one redirect in delete element."));
+ return Err(Error::ParseError(
+ "More than one redirect in delete element.",
+ ));
}
let uri = get_attr!(item, "uri", required);
redirect = Some(uri);
@@ -222,77 +234,79 @@ impl TryFrom for PubSubEvent {
impl From for Element {
fn from(event: PubSubEvent) -> Element {
let payload = match event {
- PubSubEvent::Configuration { node, form } => {
- Element::builder("configuration")
- .ns(ns::PUBSUB_EVENT)
- .attr("node", node)
- .append(form)
- .build()
- },
- PubSubEvent::Delete { node, redirect } => {
- Element::builder("purge")
- .ns(ns::PUBSUB_EVENT)
- .attr("node", node)
- .append(redirect.map(|redirect| {
- Element::builder("redirect")
- .ns(ns::PUBSUB_EVENT)
- .attr("uri", redirect)
- .build()
- }))
- .build()
- },
- PubSubEvent::PublishedItems { node, items } => {
- Element::builder("items")
- .ns(ns::PUBSUB_EVENT)
- .attr("node", node)
- .append(items)
- .build()
- },
- PubSubEvent::RetractedItems { node, items } => {
- Element::builder("items")
- .ns(ns::PUBSUB_EVENT)
- .attr("node", node)
- .append(items.into_iter().map(|id| {
- Element::builder("retract")
- .ns(ns::PUBSUB_EVENT)
- .attr("id", id)
- .build()
- }).collect::>())
- .build()
- },
- PubSubEvent::Purge { node } => {
- Element::builder("purge")
- .ns(ns::PUBSUB_EVENT)
- .attr("node", node)
- .build()
- },
- PubSubEvent::Subscription { node, expiry, jid, subid, subscription } => {
- Element::builder("subscription")
+ PubSubEvent::Configuration { node, form } => Element::builder("configuration")
+ .ns(ns::PUBSUB_EVENT)
+ .attr("node", node)
+ .append(form)
+ .build(),
+ PubSubEvent::Delete { node, redirect } => Element::builder("purge")
+ .ns(ns::PUBSUB_EVENT)
+ .attr("node", node)
+ .append(redirect.map(|redirect| {
+ Element::builder("redirect")
.ns(ns::PUBSUB_EVENT)
- .attr("node", node)
- .attr("expiry", expiry)
- .attr("jid", jid)
- .attr("subid", subid)
- .attr("subscription", subscription)
+ .attr("uri", redirect)
.build()
- },
+ }))
+ .build(),
+ PubSubEvent::PublishedItems { node, items } => Element::builder("items")
+ .ns(ns::PUBSUB_EVENT)
+ .attr("node", node)
+ .append(items)
+ .build(),
+ PubSubEvent::RetractedItems { node, items } => Element::builder("items")
+ .ns(ns::PUBSUB_EVENT)
+ .attr("node", node)
+ .append(
+ items
+ .into_iter()
+ .map(|id| {
+ Element::builder("retract")
+ .ns(ns::PUBSUB_EVENT)
+ .attr("id", id)
+ .build()
+ })
+ .collect::>(),
+ )
+ .build(),
+ PubSubEvent::Purge { node } => Element::builder("purge")
+ .ns(ns::PUBSUB_EVENT)
+ .attr("node", node)
+ .build(),
+ PubSubEvent::Subscription {
+ node,
+ expiry,
+ jid,
+ subid,
+ subscription,
+ } => Element::builder("subscription")
+ .ns(ns::PUBSUB_EVENT)
+ .attr("node", node)
+ .attr("expiry", expiry)
+ .attr("jid", jid)
+ .attr("subid", subid)
+ .attr("subscription", subscription)
+ .build(),
};
Element::builder("event")
- .ns(ns::PUBSUB_EVENT)
- .append(payload)
- .build()
+ .ns(ns::PUBSUB_EVENT)
+ .append(payload)
+ .build()
}
}
#[cfg(test)]
mod tests {
use super::*;
- use std::str::FromStr;
use crate::compare_elements::NamespaceAwareCompare;
+ use std::str::FromStr;
#[test]
fn missing_items() {
- let elem: Element = "".parse().unwrap();
+ let elem: Element =
+ ""
+ .parse()
+ .unwrap();
let error = PubSubEvent::try_from(elem).unwrap_err();
let message = match error {
Error::ParseError(string) => string,
@@ -309,9 +323,12 @@ mod tests {
PubSubEvent::PublishedItems { node, items } => {
assert_eq!(node, NodeName(String::from("coucou")));
assert_eq!(items[0].id, Some(ItemId(String::from("test"))));
- assert_eq!(items[0].publisher, Some(Jid::from_str("test@coucou").unwrap()));
+ assert_eq!(
+ items[0].publisher,
+ Some(Jid::from_str("test@coucou").unwrap())
+ );
assert_eq!(items[0].payload, None);
- },
+ }
_ => panic!(),
}
}
@@ -329,7 +346,7 @@ mod tests {
Some(ref elem) => assert!(elem.is("foreign", "example:namespace")),
_ => panic!(),
}
- },
+ }
_ => panic!(),
}
}
@@ -343,7 +360,7 @@ mod tests {
assert_eq!(node, NodeName(String::from("something")));
assert_eq!(items[0], ItemId(String::from("coucou")));
assert_eq!(items[1], ItemId(String::from("test")));
- },
+ }
_ => panic!(),
}
}
@@ -356,19 +373,22 @@ mod tests {
PubSubEvent::Delete { node, redirect } => {
assert_eq!(node, NodeName(String::from("coucou")));
assert_eq!(redirect, Some(String::from("hello")));
- },
+ }
_ => panic!(),
}
}
#[test]
fn test_simple_purge() {
- let elem: Element = "".parse().unwrap();
+ let elem: Element =
+ ""
+ .parse()
+ .unwrap();
let event = PubSubEvent::try_from(elem).unwrap();
match event {
PubSubEvent::Purge { node } => {
assert_eq!(node, NodeName(String::from("coucou")));
- },
+ }
_ => panic!(),
}
}
@@ -381,14 +401,17 @@ mod tests {
PubSubEvent::Configuration { node, form: _ } => {
assert_eq!(node, NodeName(String::from("coucou")));
//assert_eq!(form.type_, Result_);
- },
+ }
_ => panic!(),
}
}
#[test]
fn test_invalid() {
- let elem: Element = "".parse().unwrap();
+ let elem: Element =
+ ""
+ .parse()
+ .unwrap();
let error = PubSubEvent::try_from(elem).unwrap_err();
let message = match error {
Error::ParseError(string) => string,
@@ -399,7 +422,9 @@ mod tests {
#[test]
fn test_invalid_attribute() {
- let elem: Element = "".parse().unwrap();
+ let elem: Element = ""
+ .parse()
+ .unwrap();
let error = PubSubEvent::try_from(elem).unwrap_err();
let message = match error {
Error::ParseError(string) => string,
@@ -419,16 +444,29 @@ mod tests {
subid='ba49252aaa4f5d320c24d3766f0bdcade78c78d3'
subscription='subscribed'/>
-"#.parse().unwrap();
+"#
+ .parse()
+ .unwrap();
let event = PubSubEvent::try_from(elem.clone()).unwrap();
match event.clone() {
- PubSubEvent::Subscription { node, expiry, jid, subid, subscription } => {
+ PubSubEvent::Subscription {
+ node,
+ expiry,
+ jid,
+ subid,
+ subscription,
+ } => {
assert_eq!(node, NodeName(String::from("princely_musings")));
- assert_eq!(subid, Some(SubscriptionId(String::from("ba49252aaa4f5d320c24d3766f0bdcade78c78d3"))));
+ assert_eq!(
+ subid,
+ Some(SubscriptionId(String::from(
+ "ba49252aaa4f5d320c24d3766f0bdcade78c78d3"
+ )))
+ );
assert_eq!(subscription, Some(Subscription::Subscribed));
assert_eq!(jid, Some(Jid::from_str("francisco@denmark.lit").unwrap()));
assert_eq!(expiry, Some("2006-02-28T23:59:59Z".parse().unwrap()));
- },
+ }
_ => panic!(),
}
diff --git a/src/pubsub/pubsub.rs b/src/pubsub/pubsub.rs
index cf3d980396cf1efc200985de342927e84b2c7c42..e406d867a0eb126ea0c4c901e2c48ef53fc883b3 100644
--- a/src/pubsub/pubsub.rs
+++ b/src/pubsub/pubsub.rs
@@ -4,19 +4,14 @@
// License, v. 2.0. If a copy of the MPL was not distributed with this
// file, You can obtain one at http://mozilla.org/MPL/2.0/.
-use try_from::TryFrom;
-
-use minidom::Element;
-use jid::Jid;
-
+use crate::data_forms::DataForm;
use crate::error::Error;
-
+use crate::iq::{IqGetPayload, IqResultPayload, IqSetPayload};
use crate::ns;
-
-use crate::iq::{IqGetPayload, IqSetPayload, IqResultPayload};
-use crate::data_forms::DataForm;
-
-use crate::pubsub::{NodeName, ItemId, Subscription, SubscriptionId};
+use crate::pubsub::{ItemId, NodeName, Subscription, SubscriptionId};
+use jid::Jid;
+use minidom::Element;
+use try_from::TryFrom;
// TODO: a better solution would be to split this into a query and a result elements, like for
// XEP-0030.
@@ -137,7 +132,9 @@ impl TryFrom for Item {
let mut payloads = elem.children().cloned().collect::>();
let payload = payloads.pop();
if !payloads.is_empty() {
- return Err(Error::ParseError("More than a single payload in item element."));
+ return Err(Error::ParseError(
+ "More than a single payload in item element.",
+ ));
}
Ok(Item {
payload,
@@ -149,10 +146,10 @@ impl TryFrom for Item {
impl From
- for Element {
fn from(item: Item) -> Element {
Element::builder("item")
- .ns(ns::PUBSUB)
- .attr("id", item.id)
- .append(item.payload)
- .build()
+ .ns(ns::PUBSUB)
+ .attr("id", item.id)
+ .append(item.payload)
+ .build()
}
}
@@ -199,7 +196,9 @@ generate_element!(
generate_attribute!(
/// Whether a retract request should notify subscribers or not.
- Notify, "notify", bool
+ Notify,
+ "notify",
+ bool
);
generate_element!(
@@ -235,11 +234,15 @@ impl TryFrom for SubscribeOptions {
for child in elem.children() {
if child.is("required", ns::PUBSUB) {
if required {
- return Err(Error::ParseError("More than one required element in subscribe-options."));
+ return Err(Error::ParseError(
+ "More than one required element in subscribe-options.",
+ ));
}
required = true;
} else {
- return Err(Error::ParseError("Unknown child in subscribe-options element."));
+ return Err(Error::ParseError(
+ "Unknown child in subscribe-options element.",
+ ));
}
}
Ok(SubscribeOptions { required })
@@ -251,12 +254,10 @@ impl From for Element {
Element::builder("subscribe-options")
.ns(ns::PUBSUB)
.append(if subscribe_options.required {
- vec!(Element::builder("required")
- .ns(ns::PUBSUB)
- .build())
- } else {
- vec!()
- })
+ vec![Element::builder("required").ns(ns::PUBSUB).build()]
+ } else {
+ vec![]
+ })
.build()
}
}
@@ -334,7 +335,7 @@ pub enum PubSub {
create: Create,
/// The configure request for the new node.
- configure: Option
+ configure: Option,
},
/// Request to publish items to a node, with optional options.
@@ -343,7 +344,7 @@ pub enum PubSub {
publish: Publish,
/// The options related to this publish request.
- publish_options: Option
+ publish_options: Option,
},
/// A list of affiliations you have on a service, or on a node.
@@ -383,75 +384,114 @@ impl TryFrom for PubSub {
for child in elem.children() {
if child.is("create", ns::PUBSUB) {
if payload.is_some() {
- return Err(Error::ParseError("Payload is already defined in pubsub element."));
+ return Err(Error::ParseError(
+ "Payload is already defined in pubsub element.",
+ ));
}
let create = Create::try_from(child.clone())?;
- payload = Some(PubSub::Create { create, configure: None });
+ payload = Some(PubSub::Create {
+ create,
+ configure: None,
+ });
} else if child.is("configure", ns::PUBSUB) {
if let Some(PubSub::Create { create, configure }) = payload {
if configure.is_some() {
- return Err(Error::ParseError("Configure is already defined in pubsub element."));
+ return Err(Error::ParseError(
+ "Configure is already defined in pubsub element.",
+ ));
}
let configure = Some(Configure::try_from(child.clone())?);
payload = Some(PubSub::Create { create, configure });
} else {
- return Err(Error::ParseError("Payload is already defined in pubsub element."));
+ return Err(Error::ParseError(
+ "Payload is already defined in pubsub element.",
+ ));
}
} else if child.is("publish", ns::PUBSUB) {
if payload.is_some() {
- return Err(Error::ParseError("Payload is already defined in pubsub element."));
+ return Err(Error::ParseError(
+ "Payload is already defined in pubsub element.",
+ ));
}
let publish = Publish::try_from(child.clone())?;
- payload = Some(PubSub::Publish { publish, publish_options: None });
+ payload = Some(PubSub::Publish {
+ publish,
+ publish_options: None,
+ });
} else if child.is("publish-options", ns::PUBSUB) {
- if let Some(PubSub::Publish { publish, publish_options }) = payload {
+ if let Some(PubSub::Publish {
+ publish,
+ publish_options,
+ }) = payload
+ {
if publish_options.is_some() {
- return Err(Error::ParseError("Publish-options are already defined in pubsub element."));
+ return Err(Error::ParseError(
+ "Publish-options are already defined in pubsub element.",
+ ));
}
let publish_options = Some(PublishOptions::try_from(child.clone())?);
- payload = Some(PubSub::Publish { publish, publish_options });
+ payload = Some(PubSub::Publish {
+ publish,
+ publish_options,
+ });
} else {
- return Err(Error::ParseError("Payload is already defined in pubsub element."));
+ return Err(Error::ParseError(
+ "Payload is already defined in pubsub element.",
+ ));
}
} else if child.is("affiliations", ns::PUBSUB) {
if payload.is_some() {
- return Err(Error::ParseError("Payload is already defined in pubsub element."));
+ return Err(Error::ParseError(
+ "Payload is already defined in pubsub element.",
+ ));
}
let affiliations = Affiliations::try_from(child.clone())?;
payload = Some(PubSub::Affiliations(affiliations));
} else if child.is("default", ns::PUBSUB) {
if payload.is_some() {
- return Err(Error::ParseError("Payload is already defined in pubsub element."));
+ return Err(Error::ParseError(
+ "Payload is already defined in pubsub element.",
+ ));
}
let default = Default::try_from(child.clone())?;
payload = Some(PubSub::Default(default));
} else if child.is("items", ns::PUBSUB) {
if payload.is_some() {
- return Err(Error::ParseError("Payload is already defined in pubsub element."));
+ return Err(Error::ParseError(
+ "Payload is already defined in pubsub element.",
+ ));
}
let items = Items::try_from(child.clone())?;
payload = Some(PubSub::Items(items));
} else if child.is("retract", ns::PUBSUB) {
if payload.is_some() {
- return Err(Error::ParseError("Payload is already defined in pubsub element."));
+ return Err(Error::ParseError(
+ "Payload is already defined in pubsub element.",
+ ));
}
let retract = Retract::try_from(child.clone())?;
payload = Some(PubSub::Retract(retract));
} else if child.is("subscription", ns::PUBSUB) {
if payload.is_some() {
- return Err(Error::ParseError("Payload is already defined in pubsub element."));
+ return Err(Error::ParseError(
+ "Payload is already defined in pubsub element.",
+ ));
}
let subscription = SubscriptionElem::try_from(child.clone())?;
payload = Some(PubSub::Subscription(subscription));
} else if child.is("subscriptions", ns::PUBSUB) {
if payload.is_some() {
- return Err(Error::ParseError("Payload is already defined in pubsub element."));
+ return Err(Error::ParseError(
+ "Payload is already defined in pubsub element.",
+ ));
}
let subscriptions = Subscriptions::try_from(child.clone())?;
payload = Some(PubSub::Subscriptions(subscriptions));
} else if child.is("unsubscribe", ns::PUBSUB) {
if payload.is_some() {
- return Err(Error::ParseError("Payload is already defined in pubsub element."));
+ return Err(Error::ParseError(
+ "Payload is already defined in pubsub element.",
+ ));
}
let unsubscribe = Unsubscribe::try_from(child.clone())?;
payload = Some(PubSub::Unsubscribe(unsubscribe));
@@ -468,28 +508,31 @@ impl From for Element {
Element::builder("pubsub")
.ns(ns::PUBSUB)
.append(match pubsub {
- PubSub::Create { create, configure } => {
- let mut elems = vec!(Element::from(create));
- if let Some(configure) = configure {
- elems.push(Element::from(configure));
- }
- elems
- },
- PubSub::Publish { publish, publish_options } => {
- let mut elems = vec!(Element::from(publish));
- if let Some(publish_options) = publish_options {
- elems.push(Element::from(publish_options));
- }
- elems
- },
- PubSub::Affiliations(affiliations) => vec!(Element::from(affiliations)),
- PubSub::Default(default) => vec!(Element::from(default)),
- PubSub::Items(items) => vec!(Element::from(items)),
- PubSub::Retract(retract) => vec!(Element::from(retract)),
- PubSub::Subscription(subscription) => vec!(Element::from(subscription)),
- PubSub::Subscriptions(subscriptions) => vec!(Element::from(subscriptions)),
- PubSub::Unsubscribe(unsubscribe) => vec!(Element::from(unsubscribe)),
- })
+ PubSub::Create { create, configure } => {
+ let mut elems = vec![Element::from(create)];
+ if let Some(configure) = configure {
+ elems.push(Element::from(configure));
+ }
+ elems
+ }
+ PubSub::Publish {
+ publish,
+ publish_options,
+ } => {
+ let mut elems = vec![Element::from(publish)];
+ if let Some(publish_options) = publish_options {
+ elems.push(Element::from(publish_options));
+ }
+ elems
+ }
+ PubSub::Affiliations(affiliations) => vec![Element::from(affiliations)],
+ PubSub::Default(default) => vec![Element::from(default)],
+ PubSub::Items(items) => vec![Element::from(items)],
+ PubSub::Retract(retract) => vec![Element::from(retract)],
+ PubSub::Subscription(subscription) => vec![Element::from(subscription)],
+ PubSub::Subscriptions(subscriptions) => vec![Element::from(subscriptions)],
+ PubSub::Unsubscribe(unsubscribe) => vec![Element::from(unsubscribe)],
+ })
.build()
}
}
@@ -501,7 +544,9 @@ mod tests {
#[test]
fn create() {
- let elem: Element = "".parse().unwrap();
+ let elem: Element = ""
+ .parse()
+ .unwrap();
let elem1 = elem.clone();
let pubsub = PubSub::try_from(elem).unwrap();
match pubsub.clone() {
@@ -515,7 +560,10 @@ mod tests {
let elem2 = Element::from(pubsub);
assert!(elem1.compare_to(&elem2));
- let elem: Element = "".parse().unwrap();
+ let elem: Element =
+ ""
+ .parse()
+ .unwrap();
let elem1 = elem.clone();
let pubsub = PubSub::try_from(elem).unwrap();
match pubsub.clone() {
@@ -532,7 +580,10 @@ mod tests {
#[test]
fn create_and_configure() {
- let elem: Element = "".parse().unwrap();
+ let elem: Element =
+ ""
+ .parse()
+ .unwrap();
let elem1 = elem.clone();
let pubsub = PubSub::try_from(elem).unwrap();
match pubsub.clone() {
@@ -549,11 +600,17 @@ mod tests {
#[test]
fn publish() {
- let elem: Element = "".parse().unwrap();
+ let elem: Element =
+ ""
+ .parse()
+ .unwrap();
let elem1 = elem.clone();
let pubsub = PubSub::try_from(elem).unwrap();
match pubsub.clone() {
- PubSub::Publish { publish, publish_options } => {
+ PubSub::Publish {
+ publish,
+ publish_options,
+ } => {
assert_eq!(&publish.node.0, "coucou");
assert!(publish_options.is_none());
}
@@ -570,7 +627,10 @@ mod tests {
let elem1 = elem.clone();
let pubsub = PubSub::try_from(elem).unwrap();
match pubsub.clone() {
- PubSub::Publish { publish, publish_options } => {
+ PubSub::Publish {
+ publish,
+ publish_options,
+ } => {
assert_eq!(&publish.node.0, "coucou");
assert!(publish_options.unwrap().form.is_none());
}
@@ -583,7 +643,9 @@ mod tests {
#[test]
fn invalid_empty_pubsub() {
- let elem: Element = "".parse().unwrap();
+ let elem: Element = ""
+ .parse()
+ .unwrap();
let error = PubSub::try_from(elem).unwrap_err();
let message = match error {
Error::ParseError(string) => string,
@@ -596,12 +658,17 @@ mod tests {
fn publish_option() {
let elem: Element = "http://jabber.org/protocol/pubsub#publish-options".parse().unwrap();
let publish_options = PublishOptions::try_from(elem).unwrap();
- assert_eq!(&publish_options.form.unwrap().form_type.unwrap(), "http://jabber.org/protocol/pubsub#publish-options");
+ assert_eq!(
+ &publish_options.form.unwrap().form_type.unwrap(),
+ "http://jabber.org/protocol/pubsub#publish-options"
+ );
}
#[test]
fn subscribe_options() {
- let elem1: Element = "".parse().unwrap();
+ let elem1: Element = ""
+ .parse()
+ .unwrap();
let subscribe_options1 = SubscribeOptions::try_from(elem1).unwrap();
assert_eq!(subscribe_options1.required, false);
diff --git a/src/receipts.rs b/src/receipts.rs
index 61877f576d2ebbb2d11aef84f53de0b39c20dec9..c97d3e118358630758fa253d5e0153fbea3cf8cc 100644
--- a/src/receipts.rs
+++ b/src/receipts.rs
@@ -9,7 +9,9 @@ use crate::message::MessagePayload;
generate_empty_element!(
/// Requests that this message is acked by the final recipient once
/// received.
- Request, "request", RECEIPTS
+ Request,
+ "request",
+ RECEIPTS
);
impl MessagePayload for Request {}
@@ -29,9 +31,9 @@ impl MessagePayload for Received {}
#[cfg(test)]
mod tests {
use super::*;
- use try_from::TryFrom;
- use minidom::Element;
use crate::ns;
+ use minidom::Element;
+ use try_from::TryFrom;
#[cfg(target_pointer_width = "32")]
#[test]
@@ -55,7 +57,9 @@ mod tests {
let elem: Element = "".parse().unwrap();
Received::try_from(elem).unwrap();
- let elem: Element = "".parse().unwrap();
+ let elem: Element = ""
+ .parse()
+ .unwrap();
Received::try_from(elem).unwrap();
}
diff --git a/src/roster.rs b/src/roster.rs
index 86d023098767cb2a530bb2f16cc84d4a8276eaca..40cc7a25dc7f8a7f935306df4507e3cff8d4862e 100644
--- a/src/roster.rs
+++ b/src/roster.rs
@@ -4,12 +4,14 @@
// License, v. 2.0. If a copy of the MPL was not distributed with this
// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+use crate::iq::{IqGetPayload, IqResultPayload, IqSetPayload};
use jid::Jid;
-use crate::iq::{IqGetPayload, IqSetPayload, IqResultPayload};
generate_elem_id!(
/// Represents a group a contact is part of.
- Group, "group", ROSTER
+ Group,
+ "group",
+ ROSTER
);
generate_attribute!(
@@ -79,11 +81,11 @@ impl IqResultPayload for Roster {}
#[cfg(test)]
mod tests {
use super::*;
- use try_from::TryFrom;
- use minidom::Element;
+ use crate::compare_elements::NamespaceAwareCompare;
use crate::error::Error;
+ use minidom::Element;
use std::str::FromStr;
- use crate::compare_elements::NamespaceAwareCompare;
+ use try_from::TryFrom;
#[cfg(target_pointer_width = "32")]
#[test]
@@ -122,7 +124,9 @@ mod tests {
let roster2 = Roster::try_from(elem2).unwrap();
assert_eq!(roster.items, roster2.items);
- let elem: Element = "".parse().unwrap();
+ let elem: Element = ""
+ .parse()
+ .unwrap();
let roster = Roster::try_from(elem).unwrap();
assert_eq!(roster.ver, Some(String::from("ver9")));
assert!(roster.items.is_empty());
@@ -141,14 +145,22 @@ mod tests {
name='Benvolio'
subscription='both'/>
-"#.parse().unwrap();
+"#
+ .parse()
+ .unwrap();
let roster = Roster::try_from(elem).unwrap();
assert_eq!(roster.ver, Some(String::from("ver11")));
assert_eq!(roster.items.len(), 3);
- assert_eq!(roster.items[0].jid, Jid::from_str("romeo@example.net").unwrap());
+ assert_eq!(
+ roster.items[0].jid,
+ Jid::from_str("romeo@example.net").unwrap()
+ );
assert_eq!(roster.items[0].name, Some(String::from("Romeo")));
assert_eq!(roster.items[0].subscription, Subscription::Both);
- assert_eq!(roster.items[0].groups, vec!(Group::from_str("Friends").unwrap()));
+ assert_eq!(
+ roster.items[0].groups,
+ vec!(Group::from_str("Friends").unwrap())
+ );
}
#[test]
@@ -160,12 +172,17 @@ mod tests {
B
-"#.parse().unwrap();
+"#
+ .parse()
+ .unwrap();
let elem1 = elem.clone();
let roster = Roster::try_from(elem).unwrap();
assert!(roster.ver.is_none());
assert_eq!(roster.items.len(), 1);
- assert_eq!(roster.items[0].jid, Jid::from_str("test@example.org").unwrap());
+ assert_eq!(
+ roster.items[0].jid,
+ Jid::from_str("test@example.org").unwrap()
+ );
assert_eq!(roster.items[0].name, None);
assert_eq!(roster.items[0].groups.len(), 2);
assert_eq!(roster.items[0].groups[0], Group::from_str("A").unwrap());
@@ -176,7 +193,10 @@ mod tests {
#[test]
fn test_set() {
- let elem: Element = "
-"#.parse().unwrap();
+"#
+ .parse()
+ .unwrap();
let roster = Roster::try_from(elem).unwrap();
assert!(roster.ver.is_none());
assert_eq!(roster.items.len(), 1);
- assert_eq!(roster.items[0].jid, Jid::from_str("nurse@example.com").unwrap());
+ assert_eq!(
+ roster.items[0].jid,
+ Jid::from_str("nurse@example.com").unwrap()
+ );
assert_eq!(roster.items[0].name, Some(String::from("Nurse")));
assert_eq!(roster.items[0].groups.len(), 1);
- assert_eq!(roster.items[0].groups[0], Group::from_str("Servants").unwrap());
+ assert_eq!(
+ roster.items[0].groups[0],
+ Group::from_str("Servants").unwrap()
+ );
let elem: Element = r#"