pep/xmpp-rs-mirror
1
0
Fork 0
mirror of https://gitlab.com/xmpp-rs/xmpp-rs.git synced 2024-07-12 22:21:53 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

rustfmt pass after split-jids merge

Browse source 
Signed-off-by: Maxime “pep” Buquet <pep@bouah.net>
This commit is contained in:
Maxime “pep” Buquet 2019-06-10 22:04:03 +02:00
parent c7132bee9b
commit 24aef813b3
Signed by: pep
GPG key ID: DEDA74AEECA9D0F2
1 changed files with 12 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
src/lib.rs
View file

@ -56,7 +56,7 @@ impl FromStr for Jid {
None => Jid::Bare(BareJid {
node: ns,
domain: ds,
})
}),
})
}
}
@ -235,11 +235,7 @@ fn _from_str(s: &str) -> Result<StringJid, JidParseError> {
} else if let ParserState::Resource = state {
return Err(JidParseError::EmptyResource);
}
Ok((
node,
domain.ok_or(JidParseError::NoDomain)?,
resource,
))
Ok((node, domain.ok_or(JidParseError::NoDomain)?, resource))
}
impl FromStr for FullJid {
@ -280,7 +276,7 @@ impl FullJid {
FullJid {
node: Some(node.into()),
domain: domain.into(),
resource: resource.into()
resource: resource.into(),
}
}
@ -554,7 +550,10 @@ mod tests {
#[test]
fn can_parse_full_jids() {
assert_eq!(FullJid::from_str("a@b.c/d"), Ok(FullJid::new("a", "b.c", "d")));
assert_eq!(
FullJid::from_str("a@b.c/d"),
Ok(FullJid::new("a", "b.c", "d"))
);
assert_eq!(
FullJid::from_str("b.c/d"),
Ok(FullJid {
@ -606,7 +605,10 @@ mod tests {
#[test]
fn bare_to_full_jid() {
assert_eq!(BareJid::new("a", "b.c").with_resource("d"), FullJid::new("a", "b.c", "d"));
assert_eq!(
BareJid::new("a", "b.c").with_resource("d"),
FullJid::new("a", "b.c", "d")
);
}
#[test]
@ -615,10 +617,7 @@ mod tests {
String::from(FullJid::new("a", "b", "c")),
String::from("a@b/c")
);
assert_eq!(
String::from(BareJid::new("a", "b")),
String::from("a@b")
);
assert_eq!(String::from(BareJid::new("a", "b")), String::from("a@b"));
}
#[test]