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

jid: Simplify from_parts() a bit

Browse source 
By defining the variables in the parent scope, we can avoid one level of
indentation for the tuple, which makes things more readable.

Additionally, we don’t need to call .to_str() on the passed objects,
they automatically Deref to &str for the format!() call.
This commit is contained in:
Emmanuel Gil Peyrot 2024-07-15 18:27:35 +02:00
parent c631e4eff4
commit b4b0a7dbba
1 changed files with 18 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
jid/src/lib.rs
View file

@ -687,25 +687,18 @@ impl FullJid {
domain: &DomainRef,
resource: &ResourceRef,
) -> FullJid {
let (at, slash, normalized) = if let Some(node) = node {
let (at, slash, normalized);
if let Some(node) = node {
// Parts are never empty so len > 0 for NonZeroU16::new is always Some
(
NonZeroU16::new(node.len() as u16),
NonZeroU16::new((node.len() + 1 + domain.len()) as u16),
format!(
"{}@{}/{}",
node.as_str(),
domain.as_str(),
resource.as_str()
),
)
at = NonZeroU16::new(node.len() as u16);
slash = NonZeroU16::new((node.len() + 1 + domain.len()) as u16);
normalized = format!("{node}@{domain}/{resource}");
} else {
(
None,
NonZeroU16::new(domain.len() as u16),
format!("{}/{}", domain.as_str(), resource.as_str()),
)
};
at = None;
slash = NonZeroU16::new(domain.len() as u16);
normalized = format!("{domain}/{resource}");
}
let inner = Jid {
normalized,
@ -778,15 +771,16 @@ impl BareJid {
/// allocation if `node` is known to be `None` and `domain` is owned, you
/// can use `domain.into()`.
pub fn from_parts(node: Option<&NodeRef>, domain: &DomainRef) -> Self {
let (at, normalized) = if let Some(node) = node {
let (at, normalized);
if let Some(node) = node {
// Parts are never empty so len > 0 for NonZeroU16::new is always Some
(
NonZeroU16::new(node.len() as u16),
format!("{}@{}", node.as_str(), domain.as_str()),
)
at = NonZeroU16::new(node.len() as u16);
normalized = format!("{node}@{domain}");
} else {
(None, domain.to_string())
};
at = None;
normalized = domain.to_string();
}
let inner = Jid {
normalized,