From 28359ea7f4692d907bba7460cbc75e9b2a6b090e Mon Sep 17 00:00:00 2001 From: Nick Cardin Date: Thu, 26 Nov 2020 00:19:19 +0000 Subject: [PATCH] fix clippy --- Cargo.lock | 14 ++++---------- Cargo.toml | 5 +---- crates/socket/src/multiplexing.rs | 2 +- crates/socket/src/sink.rs | 2 +- 4 files changed, 7 insertions(+), 16 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 805ffa0..65ef99b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -341,6 +341,8 @@ dependencies = [ [[package]] name = "fluvio-future" version = "0.1.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4d1d60df6b3854dc623d2acd0fa67a00f5566a758c031e5f47df262826791f85" dependencies = [ "async-fs", "async-io", @@ -471,6 +473,8 @@ dependencies = [ [[package]] name = "fluvio-test-derive" version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fc9e4cb09caa5ff039928399ef5aa99206fd1b9a59df208cf6d94e2764fe5ce0" dependencies = [ "proc-macro2", "quote", @@ -847,15 +851,6 @@ version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "77af24da69f9d9341038eba93a073b1fdaaa1b788221b00a69bce9e762cb32de" -[[package]] -name = "openssl-src" -version = "111.12.0+1.1.1h" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "858a4132194f8570a7ee9eb8629e85b23cbc4565f2d4a162e87556e5956abf61" -dependencies = [ - "cc", -] - [[package]] name = "openssl-sys" version = "0.9.58" @@ -865,7 +860,6 @@ dependencies = [ "autocfg", "cc", "libc", - "openssl-src", "pkg-config", "vcpkg", ] diff --git a/Cargo.toml b/Cargo.toml index a1e9da8..827192d 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -2,7 +2,4 @@ members = [ "crates/socket", "crates/service" -] - -[patch.crates-io] -fluvio-future = { path = "../future-aio" } \ No newline at end of file +] \ No newline at end of file diff --git a/crates/socket/src/multiplexing.rs b/crates/socket/src/multiplexing.rs index 004f6c0..173a27b 100644 --- a/crates/socket/src/multiplexing.rs +++ b/crates/socket/src/multiplexing.rs @@ -131,7 +131,7 @@ where use std::env; let var_value = env::var("car").unwrap_or_default(); - let wait_time: u64 = var_value.parse().unwrap_or_else(|_| 10); + let wait_time: u64 = var_value.parse().unwrap_or(10); wait_time }); diff --git a/crates/socket/src/sink.rs b/crates/socket/src/sink.rs index 6efdce9..e40454c 100644 --- a/crates/socket/src/sink.rs +++ b/crates/socket/src/sink.rs @@ -134,7 +134,7 @@ where self.get_mut_tcp_sink().send(bytes).await?; } StoreValue::FileSlice(f_slice) => { - if f_slice.len() == 0 { + if f_slice.is_empty() { debug!("empty slice, skipping"); } else { debug!(