summaryrefslogtreecommitdiffhomepage
path: root/src
diff options
context:
space:
mode:
authorLinus Färnstrand <linus@mullvad.net>2016-12-21 10:55:03 +0100
committerLinus Färnstrand <linus@mullvad.net>2016-12-21 10:55:03 +0100
commit9c85c6055faa12eb88a005b68fc7fd1d82ac03d2 (patch)
treed2eb328864fc745b87442ecb60c744ef2c54779b /src
parent59e3c9b7fbc2cb1e65e8420cbb93b2e6edf8c342 (diff)
parent744ee393857eef4367f8abdae7eceae55a7c320c (diff)
downloadmullvadvpn-9c85c6055faa12eb88a005b68fc7fd1d82ac03d2.tar.xz
mullvadvpn-9c85c6055faa12eb88a005b68fc7fd1d82ac03d2.zip
Merge branch 'clippy-cleanup'
Diffstat (limited to 'src')
-rw-r--r--src/net.rs4
-rw-r--r--src/process.rs2
2 files changed, 3 insertions, 3 deletions
diff --git a/src/net.rs b/src/net.rs
index 8cbc0c25e6..01bfc2c52c 100644
--- a/src/net.rs
+++ b/src/net.rs
@@ -47,14 +47,14 @@ impl RemoteAddr {
fn from_domain_str(s: &str) -> Result<Self, AddrParseError> {
let (address, port_str) = Self::split_at_last_colon(s)?;
let port = u16::from_str(port_str)?;
- if address.len() == 0 || address.contains(':') {
+ if address.is_empty() || address.contains(':') {
return Err(AddrParseError(()));
}
Ok(RemoteAddr::Domain(address.to_owned(), port))
}
fn split_at_last_colon(s: &str) -> Result<(&str, &str), AddrParseError> {
- let mut iter = s.rsplitn(2, ":");
+ let mut iter = s.rsplitn(2, ':');
let port = iter.next().unwrap();
let address = iter.next().ok_or(AddrParseError(()))?;
Ok((address, port))
diff --git a/src/process.rs b/src/process.rs
index b849e16348..08b2637faf 100644
--- a/src/process.rs
+++ b/src/process.rs
@@ -88,7 +88,7 @@ fn write_argument(fmt: &mut fmt::Formatter, arg: &str) -> fmt::Result {
if quote {
fmt.write_str("\"")?;
}
- fmt.write_str(&arg)?;
+ fmt.write_str(arg)?;
if quote {
fmt.write_str("\"")?;
}