From cc4365ac94e96c8480a556e8a7ad751fa9995df8 Mon Sep 17 00:00:00 2001 From: Nick Cardin Date: Thu, 26 Nov 2020 00:39:38 +0000 Subject: [PATCH 1/3] fix clippy, update for change in fluvio-future --- Cargo.lock | 54 +++++++++++++++++-------------- crates/service/Cargo.toml | 4 +-- crates/socket/Cargo.toml | 6 ++-- crates/socket/src/multiplexing.rs | 2 +- crates/socket/src/sink.rs | 2 +- crates/socket/src/socket.rs | 2 +- 6 files changed, 38 insertions(+), 32 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index a8f0e64..29baedc 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -141,7 +141,7 @@ dependencies = [ "memchr", "num_cpus", "once_cell", - "pin-project-lite", + "pin-project-lite 0.1.11", "pin-utils", "slab", "wasm-bindgen-futures", @@ -155,9 +155,9 @@ checksum = "e91831deabf0d6d7ec49552e489aed63b7456a7a3c46cff62adad428110b0af0" [[package]] name = "async-trait" -version = "0.1.41" +version = "0.1.42" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b246867b8b3b6ae56035f1eb1ed557c1d8eae97f0d53696138a50fa0e3a3b8c0" +checksum = "8d3a45e77e34375a7923b1e8febb049bb011f064714a8e17a1a616fef01da13d" dependencies = [ "proc-macro2", "quote", @@ -228,9 +228,9 @@ checksum = "631ae5198c9be5e753e5cc215e1bd73c2b466a3565173db433f52bb9d3e66dba" [[package]] name = "cc" -version = "1.0.63" +version = "1.0.65" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad9c6140b5a2c7db40ea56eb1821245e5362b44385c05b76288b1a599934ac87" +checksum = "95752358c8f7552394baf48cd82695b345628ad3f170d607de3ca03b8dacca15" [[package]] name = "cfg-if" @@ -340,9 +340,9 @@ dependencies = [ [[package]] name = "fluvio-future" -version = "0.1.11" +version = "0.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41a052e79661f925020455863a680f16687bc5de1924d59dc925b208e51df468" +checksum = "4d1d60df6b3854dc623d2acd0fa67a00f5566a758c031e5f47df262826791f85" dependencies = [ "async-fs", "async-io", @@ -429,7 +429,7 @@ dependencies = [ [[package]] name = "fluvio-service" -version = "0.3.0" +version = "0.3.1" dependencies = [ "async-trait", "event-listener", @@ -446,7 +446,7 @@ dependencies = [ [[package]] name = "fluvio-socket" -version = "0.4.2" +version = "0.4.3" dependencies = [ "async-channel", "async-mutex", @@ -553,7 +553,7 @@ dependencies = [ "futures-io", "memchr", "parking", - "pin-project-lite", + "pin-project-lite 0.1.11", "waker-fn", ] @@ -662,9 +662,9 @@ dependencies = [ [[package]] name = "instant" -version = "0.1.8" +version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb1fc4429a33e1f80d41dc9fea4d108a88bec1de8053878898ae448a0b52f613" +checksum = "61124eeebbd69b8190558df225adf7e4caafce0d743919e5d6b19652314ec5ec" dependencies = [ "cfg-if 1.0.0", ] @@ -952,6 +952,12 @@ version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c917123afa01924fc84bb20c4c03f004d9c38e5127e3c039bbf7f4b9c76a2f6b" +[[package]] +name = "pin-project-lite" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6b063f57ec186e6140e2b8b6921e5f1bd89c7356dda5b33acc5401203ca6131c" + [[package]] name = "pin-utils" version = "0.1.0" @@ -1133,9 +1139,9 @@ dependencies = [ [[package]] name = "ring" -version = "0.16.16" +version = "0.16.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b72b84d47e8ec5a4f2872e8262b8f8256c5be1c938a7d6d3a867a3ba8f722f74" +checksum = "c5911690c9b773bab7e657471afc207f3827b249a657241327e3544d79bcabdd" dependencies = [ "cc", "libc", @@ -1314,9 +1320,9 @@ checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" [[package]] name = "syn" -version = "1.0.48" +version = "1.0.51" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc371affeffc477f42a221a1e4297aedcea33d47d19b61455588bd9d8f6b19ac" +checksum = "3b4f34193997d92804d359ed09953e25d5138df6bcc055a71bf68ee89fdf9223" dependencies = [ "proc-macro2", "quote", @@ -1379,9 +1385,9 @@ dependencies = [ [[package]] name = "tinyvec" -version = "1.0.1" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b78a366903f506d2ad52ca8dc552102ffdd3e937ba8a227f024dc1d1eae28575" +checksum = "ccf8dbc19eb42fba10e8feaaec282fb50e2c14b2726d6301dbfeed0f73306a6f" dependencies = [ "tinyvec_macros", ] @@ -1400,7 +1406,7 @@ checksum = "a6d7ad61edd59bfcc7e80dababf0f4aed2e6d5e0ba1659356ae889752dfc12ff" dependencies = [ "bytes", "futures-core", - "pin-project-lite", + "pin-project-lite 0.1.11", "tokio-macros", ] @@ -1426,18 +1432,18 @@ dependencies = [ "futures-io", "futures-sink", "log", - "pin-project-lite", + "pin-project-lite 0.1.11", "tokio", ] [[package]] name = "tracing" -version = "0.1.21" +version = "0.1.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0987850db3733619253fe60e17cb59b82d37c7e6c0236bb81e4d6b87c879f27" +checksum = "9f47026cdc4080c07e49b37087de021820269d996f581aac150ef9e5583eefe3" dependencies = [ - "cfg-if 0.1.10", - "pin-project-lite", + "cfg-if 1.0.0", + "pin-project-lite 0.2.0", "tracing-attributes", "tracing-core", ] diff --git a/crates/service/Cargo.toml b/crates/service/Cargo.toml index d9795a6..51103fa 100644 --- a/crates/service/Cargo.toml +++ b/crates/service/Cargo.toml @@ -1,7 +1,7 @@ [package] edition = "2018" name = "fluvio-service" -version = "0.3.0" +version = "0.3.1" authors = ["Fluvio Contributors "] description = "Provide TCP service wrapper over fluvio protocol" repository = "https://github.com/infinyon/fluvio-socket" @@ -24,7 +24,7 @@ tokio = { version = "0.2.21", features = ["macros"] } # Fluvio dependencies futures-util = { version = "0.3.5" } fluvio-future = { version = "0.1.0" } -fluvio-socket = { version = "0.4.0", path = "../socket" } +fluvio-socket = { path = "../socket" } fluvio-protocol = { version = "0.2.0", features = ["derive", "api", "codec"] } diff --git a/crates/socket/Cargo.toml b/crates/socket/Cargo.toml index 8fdbf58..fb86659 100644 --- a/crates/socket/Cargo.toml +++ b/crates/socket/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "fluvio-socket" -version = "0.4.2" +version = "0.4.3" edition = "2018" authors = ["Fluvio Contributors "] description = "Provide TCP socket wrapper for fluvio protocol" @@ -35,10 +35,10 @@ pin-project = "1.0.1" thiserror = "1.0.20" # Fluvio dependencies -fluvio-future = { version = "0.1.11", features = ["net", "zero_copy"] } +fluvio-future = { version = "0.1.12", features = ["net", "zero_copy"] } fluvio-protocol = { version = "0.2.0", features = ["derive", "api", "codec", "store"] } [dev-dependencies] -fluvio-future = { version = "0.1.5", features = ["fixture","fs","native2_tls"] } +fluvio-future = { version = "0.1.12", features = ["fixture", "fs", "native2_tls"] } flv-util = { version = "0.5.0", features = ["fixture"] } 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!( diff --git a/crates/socket/src/socket.rs b/crates/socket/src/socket.rs index c5c8969..380d4e0 100644 --- a/crates/socket/src/socket.rs +++ b/crates/socket/src/socket.rs @@ -121,7 +121,7 @@ impl From<(InnerFlvSink, InnerFlvStream)> for InnerFlvSocket { impl FlvSocket { pub async fn connect(addr: &str) -> Result { - Self::connect_with_connector(addr, &DefaultTcpDomainConnector::new()).await + Self::connect_with_connector(addr, &DefaultTcpDomainConnector).await } } From cce575aee59ab6b296b877b7464cd140bef755b1 Mon Sep 17 00:00:00 2001 From: Nick Cardin Date: Thu, 26 Nov 2020 01:06:42 +0000 Subject: [PATCH 2/3] revert change to service --- crates/service/Cargo.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/crates/service/Cargo.toml b/crates/service/Cargo.toml index 51103fa..d9795a6 100644 --- a/crates/service/Cargo.toml +++ b/crates/service/Cargo.toml @@ -1,7 +1,7 @@ [package] edition = "2018" name = "fluvio-service" -version = "0.3.1" +version = "0.3.0" authors = ["Fluvio Contributors "] description = "Provide TCP service wrapper over fluvio protocol" repository = "https://github.com/infinyon/fluvio-socket" @@ -24,7 +24,7 @@ tokio = { version = "0.2.21", features = ["macros"] } # Fluvio dependencies futures-util = { version = "0.3.5" } fluvio-future = { version = "0.1.0" } -fluvio-socket = { path = "../socket" } +fluvio-socket = { version = "0.4.0", path = "../socket" } fluvio-protocol = { version = "0.2.0", features = ["derive", "api", "codec"] } From c9332f56f906344c6535807fc90f45904ce41e44 Mon Sep 17 00:00:00 2001 From: Nick Cardin Date: Mon, 30 Nov 2020 16:49:26 +0000 Subject: [PATCH 3/3] reduce changes --- Cargo.lock | 54 +++++++++++++++++-------------------- Cargo.toml | 2 +- crates/socket/Cargo.toml | 6 ++--- crates/socket/src/sink.rs | 2 +- crates/socket/src/socket.rs | 2 +- 5 files changed, 30 insertions(+), 36 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 29baedc..a8f0e64 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -141,7 +141,7 @@ dependencies = [ "memchr", "num_cpus", "once_cell", - "pin-project-lite 0.1.11", + "pin-project-lite", "pin-utils", "slab", "wasm-bindgen-futures", @@ -155,9 +155,9 @@ checksum = "e91831deabf0d6d7ec49552e489aed63b7456a7a3c46cff62adad428110b0af0" [[package]] name = "async-trait" -version = "0.1.42" +version = "0.1.41" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d3a45e77e34375a7923b1e8febb049bb011f064714a8e17a1a616fef01da13d" +checksum = "b246867b8b3b6ae56035f1eb1ed557c1d8eae97f0d53696138a50fa0e3a3b8c0" dependencies = [ "proc-macro2", "quote", @@ -228,9 +228,9 @@ checksum = "631ae5198c9be5e753e5cc215e1bd73c2b466a3565173db433f52bb9d3e66dba" [[package]] name = "cc" -version = "1.0.65" +version = "1.0.63" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95752358c8f7552394baf48cd82695b345628ad3f170d607de3ca03b8dacca15" +checksum = "ad9c6140b5a2c7db40ea56eb1821245e5362b44385c05b76288b1a599934ac87" [[package]] name = "cfg-if" @@ -340,9 +340,9 @@ dependencies = [ [[package]] name = "fluvio-future" -version = "0.1.12" +version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d1d60df6b3854dc623d2acd0fa67a00f5566a758c031e5f47df262826791f85" +checksum = "41a052e79661f925020455863a680f16687bc5de1924d59dc925b208e51df468" dependencies = [ "async-fs", "async-io", @@ -429,7 +429,7 @@ dependencies = [ [[package]] name = "fluvio-service" -version = "0.3.1" +version = "0.3.0" dependencies = [ "async-trait", "event-listener", @@ -446,7 +446,7 @@ dependencies = [ [[package]] name = "fluvio-socket" -version = "0.4.3" +version = "0.4.2" dependencies = [ "async-channel", "async-mutex", @@ -553,7 +553,7 @@ dependencies = [ "futures-io", "memchr", "parking", - "pin-project-lite 0.1.11", + "pin-project-lite", "waker-fn", ] @@ -662,9 +662,9 @@ dependencies = [ [[package]] name = "instant" -version = "0.1.9" +version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61124eeebbd69b8190558df225adf7e4caafce0d743919e5d6b19652314ec5ec" +checksum = "cb1fc4429a33e1f80d41dc9fea4d108a88bec1de8053878898ae448a0b52f613" dependencies = [ "cfg-if 1.0.0", ] @@ -952,12 +952,6 @@ version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c917123afa01924fc84bb20c4c03f004d9c38e5127e3c039bbf7f4b9c76a2f6b" -[[package]] -name = "pin-project-lite" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b063f57ec186e6140e2b8b6921e5f1bd89c7356dda5b33acc5401203ca6131c" - [[package]] name = "pin-utils" version = "0.1.0" @@ -1139,9 +1133,9 @@ dependencies = [ [[package]] name = "ring" -version = "0.16.17" +version = "0.16.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5911690c9b773bab7e657471afc207f3827b249a657241327e3544d79bcabdd" +checksum = "b72b84d47e8ec5a4f2872e8262b8f8256c5be1c938a7d6d3a867a3ba8f722f74" dependencies = [ "cc", "libc", @@ -1320,9 +1314,9 @@ checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" [[package]] name = "syn" -version = "1.0.51" +version = "1.0.48" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b4f34193997d92804d359ed09953e25d5138df6bcc055a71bf68ee89fdf9223" +checksum = "cc371affeffc477f42a221a1e4297aedcea33d47d19b61455588bd9d8f6b19ac" dependencies = [ "proc-macro2", "quote", @@ -1385,9 +1379,9 @@ dependencies = [ [[package]] name = "tinyvec" -version = "1.1.0" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ccf8dbc19eb42fba10e8feaaec282fb50e2c14b2726d6301dbfeed0f73306a6f" +checksum = "b78a366903f506d2ad52ca8dc552102ffdd3e937ba8a227f024dc1d1eae28575" dependencies = [ "tinyvec_macros", ] @@ -1406,7 +1400,7 @@ checksum = "a6d7ad61edd59bfcc7e80dababf0f4aed2e6d5e0ba1659356ae889752dfc12ff" dependencies = [ "bytes", "futures-core", - "pin-project-lite 0.1.11", + "pin-project-lite", "tokio-macros", ] @@ -1432,18 +1426,18 @@ dependencies = [ "futures-io", "futures-sink", "log", - "pin-project-lite 0.1.11", + "pin-project-lite", "tokio", ] [[package]] name = "tracing" -version = "0.1.22" +version = "0.1.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f47026cdc4080c07e49b37087de021820269d996f581aac150ef9e5583eefe3" +checksum = "b0987850db3733619253fe60e17cb59b82d37c7e6c0236bb81e4d6b87c879f27" dependencies = [ - "cfg-if 1.0.0", - "pin-project-lite 0.2.0", + "cfg-if 0.1.10", + "pin-project-lite", "tracing-attributes", "tracing-core", ] diff --git a/Cargo.toml b/Cargo.toml index 827192d..2efe048 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -2,4 +2,4 @@ members = [ "crates/socket", "crates/service" -] \ No newline at end of file +] diff --git a/crates/socket/Cargo.toml b/crates/socket/Cargo.toml index fb86659..54ec991 100644 --- a/crates/socket/Cargo.toml +++ b/crates/socket/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "fluvio-socket" -version = "0.4.3" +version = "0.4.2" edition = "2018" authors = ["Fluvio Contributors "] description = "Provide TCP socket wrapper for fluvio protocol" @@ -35,10 +35,10 @@ pin-project = "1.0.1" thiserror = "1.0.20" # Fluvio dependencies -fluvio-future = { version = "0.1.12", features = ["net", "zero_copy"] } +fluvio-future = { version = "0.1.11", features = ["net", "zero_copy"] } fluvio-protocol = { version = "0.2.0", features = ["derive", "api", "codec", "store"] } [dev-dependencies] -fluvio-future = { version = "0.1.12", features = ["fixture", "fs", "native2_tls"] } +fluvio-future = { version = "0.1.5", features = ["fixture", "fs", "native2_tls"] } flv-util = { version = "0.5.0", features = ["fixture"] } diff --git a/crates/socket/src/sink.rs b/crates/socket/src/sink.rs index e40454c..6efdce9 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.is_empty() { + if f_slice.len() == 0 { debug!("empty slice, skipping"); } else { debug!( diff --git a/crates/socket/src/socket.rs b/crates/socket/src/socket.rs index 380d4e0..c5c8969 100644 --- a/crates/socket/src/socket.rs +++ b/crates/socket/src/socket.rs @@ -121,7 +121,7 @@ impl From<(InnerFlvSink, InnerFlvStream)> for InnerFlvSocket { impl FlvSocket { pub async fn connect(addr: &str) -> Result { - Self::connect_with_connector(addr, &DefaultTcpDomainConnector).await + Self::connect_with_connector(addr, &DefaultTcpDomainConnector::new()).await } }