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

xmpp-parsers: Prefer Bare/FromJid::new to FromStr::from_str.

Browse source
This commit is contained in:
Emmanuel Gil Peyrot 2020-12-10 20:45:30 +01:00
commit f34897b198
10 changed files with 30 additions and 49 deletions
Download patch file Download diff file Expand all files Collapse all files

7
xmpp-parsers/src/message.rs
View file

@ -95,10 +95,10 @@ pub struct Message {
impl Message {
/// Creates a new `<message/>` stanza for the given recipient.
pub fn new(to: Option<Jid>) -> Message {
pub fn new<J: Into<Option<Jid>>>(to: J) -> Message {
Message {
from: None,
to,
to: to.into(),
id: None,
type_: MessageType::Chat,
bodies: BTreeMap::new(),
@ -241,6 +241,7 @@ impl From<Message> for Element {
#[cfg(test)]
mod tests {
use super::*;
use jid::BareJid;
use std::str::FromStr;
#[cfg(target_pointer_width = "32")]
@ -319,7 +320,7 @@ mod tests {
let elem: Element = "<message xmlns='jabber:client' to='coucou@example.org' type='chat'><body>Hello world!</body></message>".parse().unwrap();
#[cfg(feature = "component")]
let elem: Element = "<message xmlns='jabber:component:accept' to='coucou@example.org' type='chat'><body>Hello world!</body></message>".parse().unwrap();
let mut message = Message::new(Some(Jid::from_str("coucou@example.org").unwrap()));
let mut message = Message::new(Jid::Bare(BareJid::new("coucou", "example.org")));
message
.bodies
.insert(String::from(""), Body::from_str("Hello world!").unwrap());