fluencelabs/rust-libp2p
1
0
Fork 0
mirror of https://github.com/fluencelabs/rust-libp2p synced 2025-06-28 01:01:34 +00:00
Code Issues Projects Releases Wiki Activity

Address some minor clippy warnings. (#1868)

Browse Source
This commit is contained in:
Roman Borschel
2020-11-30 16:45:40 +01:00
committed by GitHub
parent afc5d0ef82
commit 2cd2e6d654
3 changed files with 21 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
misc/multiaddr/src/from_url.rs
View File

@ -82,13 +82,13 @@ fn from_url_inner_http_ws(url: url::Url, lossy: bool) -> std::result::Result<Mul
return Err(FromUrlErr::BadUrl);
};
if !lossy {
if !url.username().is_empty() || url.password().is_some() ||
(lost_path && url.path() != "/" && !url.path().is_empty()) ||
url.query().is_some() || url.fragment().is_some()
{
return Err(FromUrlErr::InformationLoss);
}
if !lossy && (
!url.username().is_empty() ||
url.password().is_some() ||
(lost_path && url.path() != "/" && !url.path().is_empty()) ||
url.query().is_some() || url.fragment().is_some()
) {
return Err(FromUrlErr::InformationLoss);
}
Ok(iter::once(ip)
@ -104,12 +104,13 @@ fn from_url_inner_path(url: url::Url, lossy: bool) -> std::result::Result<Multia
_ => unreachable!("We only call this function for one of the given schemes; qed")
};
if !lossy {
if !url.username().is_empty() || url.password().is_some() ||
url.query().is_some() || url.fragment().is_some()
{
return Err(FromUrlErr::InformationLoss);
}
if !lossy && (
!url.username().is_empty() ||
url.password().is_some() ||
url.query().is_some() ||
url.fragment().is_some()
) {
return Err(FromUrlErr::InformationLoss);
}
Ok(Multiaddr::from(protocol))