Git-Mirrors/xmr-btc-swap
1
0
Fork 0
mirror of https://github.com/comit-network/xmr-btc-swap.git synced 2025-02-23 08:09:53 -05:00
Code Issues Packages Projects Releases Wiki Activity

Use or-pattern stabilized in Rust 1.53 where possible

Browse Source
This commit is contained in:
Thomas Eizinger 2021-06-21 11:57:21 +10:00
parent ac0b0150e6
commit 3aa028e3bf
No known key found for this signature in database
GPG Key ID: 651AC83A6C6C8B96
2 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
swap/src/cli/command.rs
View File

@ -55,12 +55,7 @@ where
Ok(matches) => RawArguments::from_clap(&matches), Ok(matches) => RawArguments::from_clap(&matches),
Err(clap::Error { Err(clap::Error {
message, message,
kind: clap::ErrorKind::HelpDisplayed, kind: clap::ErrorKind::HelpDisplayed | clap::ErrorKind::VersionDisplayed,
..
})
| Err(clap::Error {
message,
kind: clap::ErrorKind::VersionDisplayed,
.. ..
}) => return Ok(ParseResult::PrintAndExitZero { message }), }) => return Ok(ParseResult::PrintAndExitZero { message }),
Err(e) => anyhow::bail!(e), Err(e) => anyhow::bail!(e),

6
swap/src/network/tor_transport.rs
View File

@ -77,14 +77,12 @@ fn fmt_as_address_string(multi: Multiaddr) -> Result<String, TransportError<io::
// Deal with non-onion addresses // Deal with non-onion addresses
Some(Protocol::Ip4(addr)) => format!("{}", addr), Some(Protocol::Ip4(addr)) => format!("{}", addr),
Some(Protocol::Ip6(addr)) => format!("{}", addr), Some(Protocol::Ip6(addr)) => format!("{}", addr),
Some(Protocol::Dns(addr)) => format!("{}", addr), Some(Protocol::Dns(addr) | Protocol::Dns4(addr)) => format!("{}", addr),
Some(Protocol::Dns4(addr)) => format!("{}", addr),
_ => return Err(TransportError::MultiaddrNotSupported(multi)), _ => return Err(TransportError::MultiaddrNotSupported(multi)),
}; };
let port = match protocols.next() { let port = match protocols.next() {
Some(Protocol::Tcp(port)) => port, Some(Protocol::Tcp(port) | Protocol::Udp(port)) => port,
Some(Protocol::Udp(port)) => port,
_ => return Err(TransportError::MultiaddrNotSupported(multi)), _ => return Err(TransportError::MultiaddrNotSupported(multi)),
}; };