language-servers/deno
1
0
Fork 0
mirror of https://github.com/denoland/deno.git synced 2025-10-02 23:24:37 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Clippy fixes (also fixes build with nightly) (#1527)

Browse source
This commit is contained in:
Bert Belder 2019-01-15 13:06:25 +01:00 • committed by Ryan Dahl
parent 48ca06e420
commit d8adeb41de
12 changed files with 32 additions and 76 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/resolve_addr.rs
View file

@ -60,7 +60,7 @@ impl Future for ResolveAddrFuture {
// I absolutely despise the .to_socket_addrs() API.
let r = addr_port_pair
.to_socket_addrs()
.map_err(|e| ResolveAddrError::Resolution(e));
.map_err(ResolveAddrError::Resolution);
r.and_then(|mut iter| match iter.next() {
Some(a) => Ok(Async::Ready(a)),
@ -71,11 +71,11 @@ impl Future for ResolveAddrFuture {
}
}
fn split<'a>(address: &'a str) -> Option<(&'a str, u16)> {
address.rfind(":").and_then(|i| {
fn split(address: &str) -> Option<(&str, u16)> {
address.rfind(':').and_then(|i| {
let (a, p) = address.split_at(i);
// Default to localhost if given just the port. Example: ":80"
let addr = if a.len() > 0 { a } else { "0.0.0.0" };
let addr = if !a.is_empty() { a } else { "0.0.0.0" };
// If this looks like an ipv6 IP address. Example: "[2001:db8::1]"
// Then we remove the brackets.
let addr = if addr.starts_with('[') && addr.ends_with(']') {