diff --git a/Cargo.lock b/Cargo.lock index 7243d7ac..7fe38982 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -46,16 +46,15 @@ checksum = "4b46cbb362ab8752921c97e041f5e366ee6297bd428a31275b9fcf1e380f7299" [[package]] name = "anstream" -version = "0.3.2" +version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ca84f3628370c59db74ee214b3263d58f9aadd9b4fe7e711fd87dc452b7f163" +checksum = "2ab91ebe16eb252986481c5b62f6098f3b698a45e34b5b98200cf20dd2484a44" dependencies = [ "anstyle", "anstyle-parse", "anstyle-query", "anstyle-wincon", "colorchoice", - "is-terminal", "utf8parse", ] @@ -85,9 +84,9 @@ dependencies = [ [[package]] name = "anstyle-wincon" -version = "1.0.1" +version = "3.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "180abfa45703aebe0093f79badacc01b8fd4ea2e35118747e5811127f926e188" +checksum = "f0699d10d2f4d628a98ee7b57b289abbc98ff3bad977cb3152709d4bf2330628" dependencies = [ "anstyle", "windows-sys", @@ -95,9 +94,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.72" +version = "1.0.75" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b13c32d80ecc7ab747b80c3784bce54ee8a7a0cc4fbda9bf4cda2cf6fe90854" +checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6" [[package]] name = "autocfg" @@ -122,9 +121,9 @@ dependencies = [ [[package]] name = "base64" -version = "0.21.2" +version = "0.21.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "604178f6c5c21f02dc555784810edfb88d34ac2c73b2eae109655649ee73ce3d" +checksum = "9ba43ea6f343b788c8764558649e08df62f86c6ef251fdaeb1ffd010a9ae50a2" [[package]] name = "bincode" @@ -221,20 +220,19 @@ dependencies = [ [[package]] name = "clap" -version = "4.3.17" +version = "4.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b0827b011f6f8ab38590295339817b0d26f344aa4932c3ced71b45b0c54b4a9" +checksum = "d04704f56c2cde07f43e8e2c154b43f216dc5c92fc98ada720177362f953b956" dependencies = [ "clap_builder", "clap_derive", - "once_cell", ] [[package]] name = "clap_builder" -version = "4.3.17" +version = "4.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9441b403be87be858db6a23edb493e7f694761acdc3343d5a0fcaafd304cbc9e" +checksum = "0e231faeaca65ebd1ea3c737966bf858971cd38c3849107aa3ea7de90a804e45" dependencies = [ "anstream", "anstyle", @@ -244,14 +242,14 @@ dependencies = [ [[package]] name = "clap_derive" -version = "4.3.12" +version = "4.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54a9bb5758fc5dfe728d1019941681eccaf0cf8a4189b692a0ee2f2ecf90a050" +checksum = "0862016ff20d69b84ef8247369fabf5c008a7417002411897d40ee1f4532b873" dependencies = [ "heck", "proc-macro2", "quote", - "syn 2.0.27", + "syn 2.0.32", ] [[package]] @@ -262,9 +260,9 @@ checksum = "2da6da31387c7e4ef160ffab6d5e7f00c42626fe39aea70a7b0f1773f7dd6c1b" [[package]] name = "coarsetime" -version = "0.1.23" +version = "0.1.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a90d114103adbc625300f346d4d09dfb4ab1c4a8df6868435dd903392ecf4354" +checksum = "99280f81a35511dda7d44f7c943491b41d3ac6fd0b54aea92498bec8612a2423" dependencies = [ "libc", "once_cell", @@ -466,9 +464,9 @@ dependencies = [ [[package]] name = "fake" -version = "2.6.1" +version = "2.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a44c765350db469b774425ff1c833890b16ceb9612fb5d7c4bbdf4a1b55f876" +checksum = "9af7b0c58ac9d03169e27f080616ce9f64004edca3d2ef4147a811c21b23b319" dependencies = [ "rand", "unidecode", @@ -482,14 +480,13 @@ checksum = "6999dc1837253364c2ebb0704ba97994bd874e8f195d665c50b7548f6ea92764" [[package]] name = "flume" -version = "0.10.14" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1657b4441c3403d9f7b3409e47575237dac27b1b5726df654a6ecbf92f0f7577" +checksum = "55ac459de2512911e4b674ce33cf20befaba382d05b62b008afc1c8b57cbf181" dependencies = [ "futures-core", "futures-sink", "nanorand", - "pin-project", "spin", ] @@ -549,7 +546,7 @@ checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" dependencies = [ "proc-macro2", "quote", - "syn 2.0.27", + "syn 2.0.32", ] [[package]] @@ -640,9 +637,9 @@ checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e" [[package]] name = "hashbrown" -version = "0.14.0" +version = "0.14.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c6201b9ff9fd90a5a3bac2e56a830d0caa509576f0e503818ee82c181b3437a" +checksum = "7dfda62a12f55daeae5015f81b0baea145391cb4520f86c248fc615d72640d12" [[package]] name = "heck" @@ -664,12 +661,12 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" [[package]] name = "indexmap" -version = "2.0.0" +version = "2.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5477fe2230a79769d8dc68e0eabf5437907c0457a5614a9e8dddb67f65eb65d" +checksum = "8adf3ddd720272c6ea8bf59463c04e0f93d0bbf7c5439b691bca2987e0270897" dependencies = [ "equivalent", - "hashbrown 0.14.0", + "hashbrown 0.14.1", ] [[package]] @@ -755,9 +752,9 @@ checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3" [[package]] name = "libmimalloc-sys" -version = "0.1.33" +version = "0.1.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4ac0e912c8ef1b735e92369695618dc5b1819f5a7bf3f167301a3ba1cea515e" +checksum = "3979b5c37ece694f1f5e51e7ecc871fdb0f517ed04ee45f88d15d6d553cb9664" dependencies = [ "cc", "libc", @@ -807,15 +804,15 @@ dependencies = [ [[package]] name = "log" -version = "0.4.19" +version = "0.4.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b06a4cde4c0f271a446782e3eff8de789548ce57dbc8eca9292c27f4a42004b4" +checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" [[package]] name = "memchr" -version = "2.5.0" +version = "2.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" +checksum = "f665ee40bc4a3c5590afb1e9677db74a508659dfd71e126420da8274909a0167" [[package]] name = "memoffset" @@ -839,9 +836,9 @@ dependencies = [ [[package]] name = "mimalloc" -version = "0.1.37" +version = "0.1.39" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e2894987a3459f3ffb755608bd82188f8ed00d0ae077f1edea29c068d639d98" +checksum = "fa01922b5ea280a911e323e4d2fd24b7fe5cc4042e0d2cda3c40775cdc4bdc9c" dependencies = [ "libmimalloc-sys", ] @@ -1051,31 +1048,11 @@ dependencies = [ "windows-targets", ] -[[package]] -name = "pin-project" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c95a7476719eab1e366eaf73d0260af3021184f18177925b07f54b30089ceead" -dependencies = [ - "pin-project-internal", -] - -[[package]] -name = "pin-project-internal" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39407670928234ebc5e6e580247dd567ad73a3578460c5990f9503df207e8f07" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.27", -] - [[package]] name = "pin-project-lite" -version = "0.2.10" +version = "0.2.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c40d25201921e5ff0c862a505c6557ea88568a4e3ace775ab55e93f2f4f9d57" +checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58" [[package]] name = "pin-utils" @@ -1224,9 +1201,9 @@ dependencies = [ [[package]] name = "regex" -version = "1.9.1" +version = "1.9.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2eae68fc220f7cf2532e4494aded17545fce192d59cd996e0fe7887f4ceb575" +checksum = "ebee201405406dbf528b8b672104ae6d6d63e6d118cb10e4d51abbc7b58044ff" dependencies = [ "aho-corasick", "memchr", @@ -1236,9 +1213,9 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.3.3" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39354c10dd07468c2e73926b23bb9c2caca74c5501e38a35da70406f1d923310" +checksum = "59b23e92ee4318893fa3fe3e6fb365258efbfe6ac6ab30f090cdcbb7aa37efa9" dependencies = [ "aho-corasick", "memchr", @@ -1247,9 +1224,9 @@ dependencies = [ [[package]] name = "regex-syntax" -version = "0.7.4" +version = "0.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5ea92a5b6195c6ef2a0295ea818b312502c6fc94dde986c5553242e18fd4ce2" +checksum = "dbb5fb1acd8a1a18b3dd5be62d25485eb770e05afb408a9627d14d451bae12da" [[package]] name = "rustc-demangle" @@ -1293,29 +1270,29 @@ checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" [[package]] name = "serde" -version = "1.0.174" +version = "1.0.188" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b88756493a5bd5e5395d53baa70b194b05764ab85b59e43e4b8f4e1192fa9b1" +checksum = "cf9e0fcba69a370eed61bcf2b728575f726b50b55cba78064753d708ddc7549e" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.174" +version = "1.0.188" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e5c3a298c7f978e53536f95a63bdc4c4a64550582f31a0359a9afda6aede62e" +checksum = "4eca7ac642d82aa35b60049a6eccb4be6be75e599bd2e9adb5f875a737654af2" dependencies = [ "proc-macro2", "quote", - "syn 2.0.27", + "syn 2.0.32", ] [[package]] name = "serde_json" -version = "1.0.103" +version = "1.0.107" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d03b412469450d4404fe8499a268edd7f8b79fecb074b0d812ad64ca21f4031b" +checksum = "6b420ce6e3d8bd882e9b243c6eed35dbc9a6110c9769e74b584e0d68d1f20c65" dependencies = [ "itoa", "ryu", @@ -1337,9 +1314,9 @@ dependencies = [ [[package]] name = "sha2" -version = "0.10.7" +version = "0.10.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "479fb9d862239e610720565ca91403019f2f00410f1864c5aa7479b950a76ed8" +checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8" dependencies = [ "cfg-if", "cpufeatures", @@ -1378,12 +1355,12 @@ checksum = "62bb4feee49fdd9f707ef802e22365a35de4b7b299de4763d44bfea899442ff9" [[package]] name = "socket2" -version = "0.4.9" +version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64a4a911eed85daf18834cfaa86a79b7d266ff93ff5ba14005426219480ed662" +checksum = "4031e820eb552adee9295814c0ced9e5cf38ddf1e8b7d566d6de8e2538ea989e" dependencies = [ "libc", - "winapi", + "windows-sys", ] [[package]] @@ -1432,9 +1409,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.27" +version = "2.0.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b60f673f44a8255b9c8c657daf66a596d435f2da81a555b06dc644d080ba45e0" +checksum = "239814284fd6f1a4ffe4ca893952cdd93c224b6a1571c9a9eadd670295c0c9e2" dependencies = [ "proc-macro2", "quote", @@ -1443,9 +1420,9 @@ dependencies = [ [[package]] name = "tempfile" -version = "3.7.0" +version = "3.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5486094ee78b2e5038a6382ed7645bc084dc2ec433426ca4c3cb61e2007b8998" +checksum = "cb94d2f3cc536af71caac6b6fcebf65860b347e7ce0cc9ebe8f70d3e521054ef" dependencies = [ "cfg-if", "fastrand", @@ -1465,22 +1442,22 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.44" +version = "1.0.49" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "611040a08a0439f8248d1990b111c95baa9c704c805fa1f62104b39655fd7f90" +checksum = "1177e8c6d7ede7afde3585fd2513e611227efd6481bd78d2e82ba1ce16557ed4" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.44" +version = "1.0.49" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "090198534930841fab3a5d1bb637cde49e339654e606195f8d9c76eeb081dc96" +checksum = "10712f02019e9288794769fba95cd6847df9874d49d871d062172f9dd41bc4cc" dependencies = [ "proc-macro2", "quote", - "syn 2.0.27", + "syn 2.0.32", ] [[package]] @@ -1505,11 +1482,10 @@ dependencies = [ [[package]] name = "tokio" -version = "1.29.1" +version = "1.32.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "532826ff75199d5833b9d2c5fe410f29235e25704ee5f0ef599fb51c21f4a4da" +checksum = "17ed6077ed6cd6c74735e21f37eb16dc3935f96878b1fe961074089cc80893f9" dependencies = [ - "autocfg", "backtrace", "bytes", "libc", @@ -1529,7 +1505,7 @@ checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.27", + "syn 2.0.32", ] [[package]] @@ -1553,7 +1529,7 @@ checksum = "5f4f31f56159e98206da9efd823404b79b6ef3143b4a7ab76e67b1751b25a4ab" dependencies = [ "proc-macro2", "quote", - "syn 2.0.27", + "syn 2.0.32", ] [[package]] @@ -1682,7 +1658,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.27", + "syn 2.0.32", "wasm-bindgen-shared", ] @@ -1704,7 +1680,7 @@ checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.27", + "syn 2.0.32", "wasm-bindgen-backend", "wasm-bindgen-shared", ] diff --git a/Cargo.toml b/Cargo.toml index 0957ee5d..721d192b 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -21,7 +21,7 @@ profiler = [] [dependencies] # for logging to the console -log = { version = "0.4.19", features = ["release_max_level_info"] } +log = { version = "0.4.20", features = ["release_max_level_info"] } # used by the network for storing type-generic structures typemap_rev = "0.3.0" @@ -34,14 +34,14 @@ derivative = "2.2.0" # serialization library used for reading the config file (yaml) and serializing # the messages on the network -serde = { version = "1.0.174", features = ["derive"] } +serde = { version = "1.0.188", features = ["derive"] } serde_yaml = "0.9.25" -serde_json = "1.0.103" +serde_json = "1.0.107" bincode = "1.3.3" # handy Result type -anyhow = "1.0.72" -thiserror = "1.0.44" +anyhow = "1.0.75" +thiserror = "1.0.49" # handy iterators functions itertools = "0.11.0" @@ -53,13 +53,13 @@ once_cell = "1.18.0" ssh2 = { version = "0.9.4", optional = true } whoami = { version = "1.4.1", optional = true } shell-escape = { version = "0.1.5", optional = true } -clap = { version = "4.3.17", features = ["derive"], optional = true } -sha2 = { version = "0.10.7", optional = true } -base64 = { version = "0.21.2", optional = true } +clap = { version = "4.4.6", features = ["derive"], optional = true } +sha2 = { version = "0.10.8", optional = true } +base64 = { version = "0.21.4", optional = true } # channel implementation crossbeam-channel = { version = "0.5.8", optional = true } -flume = { version = "0.10.14", optional = true } +flume = { version = "0.11.0", optional = true } # used for csv file source csv = "1.2.2" @@ -68,9 +68,9 @@ csv = "1.2.2" lazy-init = "0.5.1" # Faster monotonic clock using libc's CLOCK_MONOTONIC_COARSE -coarsetime = "0.1.23" +coarsetime = "0.1.28" -tokio = { version = "1.29.1", features = ["rt"], default-features = false, optional = true } +tokio = { version = "1.32.0", features = ["rt"], default-features = false, optional = true } futures = { version = "0.3.28", optional = true } parking_lot = "0.12.1" @@ -78,7 +78,7 @@ parking_lot = "0.12.1" wyhash = "0.5.0" fxhash = "0.2.1" glidesort = "0.1.2" -indexmap = "2.0.0" +indexmap = "2.0.2" tracing = { version = "0.1.37", features = ["log"] } quick_cache = "0.3.0" @@ -86,20 +86,20 @@ quick_cache = "0.3.0" # for the tests env_logger = "0.10.0" rand = { version = "0.8.5", features = ["small_rng"] } -tempfile = "3.7.0" +tempfile = "3.8.0" criterion = { version = "0.5.1", features = ["html_reports"] } -fake = "2.6.1" -mimalloc = { version = "0.1.37", default-features = false } +fake = "2.8.0" +mimalloc = { version = "0.1.39", default-features = false } tracing-subscriber = "0.3.17" micrometer = { version = "0.2.6", features = ["enable"]} # for the examples -regex = "1.9.1" +regex = "1.9.6" # used in the benchmarks crossbeam-channel = "0.5.8" -flume = "0.10.14" +flume = "0.11.0" kstring = { version = "2.0.0", features = ["serde"] } nexmark = { version = "0.2.0", features = ["serde"] } diff --git a/examples/nexmark.rs b/examples/nexmark.rs index d4c429aa..cec92170 100644 --- a/examples/nexmark.rs +++ b/examples/nexmark.rs @@ -215,7 +215,9 @@ impl Q4Unary { { let (_, a) = self.open.pop().unwrap(); let s = self.state.remove(&a).unwrap(); - let Some(winner) = s.bids.into_iter().next() else { continue; }; + let Some(winner) = s.bids.into_iter().next() else { + continue; + }; return StreamElement::Item((s.auction.unwrap(), winner)); } diff --git a/src/operator/iteration/iterate.rs b/src/operator/iteration/iterate.rs index d508ca1d..8f6f8967 100644 --- a/src/operator/iteration/iterate.rs +++ b/src/operator/iteration/iterate.rs @@ -142,10 +142,10 @@ impl Iterate { if let Some(rx_input) = self.input_receiver.as_ref() { match rx_input.select(rx_feedback) { SelectResult::A(Ok(msg)) => { - self.input_stash.extend(msg.into_iter()); + self.input_stash.extend(msg); } SelectResult::B(Ok(msg)) => { - self.feedback_content.extend(msg.into_iter()); + self.feedback_content.extend(msg); } SelectResult::A(Err(Disconnected)) => { self.input_receiver = None; @@ -157,8 +157,7 @@ impl Iterate { } } } else { - self.feedback_content - .extend(rx_feedback.recv().unwrap().into_iter()); + self.feedback_content.extend(rx_feedback.recv().unwrap()); } } @@ -175,7 +174,7 @@ impl Iterate { panic!("state_receiver disconnected!"); } SelectResult::B(Ok(msg)) => { - self.input_stash.extend(msg.into_iter()); + self.input_stash.extend(msg); continue; } SelectResult::B(Err(Disconnected)) => { diff --git a/src/operator/map_async.rs b/src/operator/map_async.rs index f28e87fb..bb140e93 100644 --- a/src/operator/map_async.rs +++ b/src/operator/map_async.rs @@ -143,9 +143,7 @@ where let v: Vec<_> = futures::stream::iter(b.into_iter()) .map(|el| { let ff = ff.clone(); - tokio::spawn(async move { - micrometer::span!(el.map_async(ff.as_ref()).await, "map_async_call") - }) + tokio::spawn(async move { el.map_async(ff.as_ref()).await }) }) .buffered(buffer) .map(Result::unwrap) @@ -204,7 +202,6 @@ where #[inline] fn next(&mut self) -> StreamElement { - micrometer::span!(map_async_next); loop { if let Some(el) = self.buffer.as_mut().and_then(Iterator::next) { return el; diff --git a/tests/utils.rs b/tests/utils.rs index 5b4b94cc..69af95d1 100644 --- a/tests/utils.rs +++ b/tests/utils.rs @@ -225,7 +225,7 @@ impl TestHelper { return Some(Vec::new()); } let values = content.split(',').map(CoordUInt::from_str).collect_vec(); - process_results(values.into_iter(), |values| values.collect_vec()).ok() + process_results(values, |values| values.collect_vec()).ok() } fn parse_int_from_env(var_name: &str) -> Option { diff --git a/tests/zip.rs b/tests/zip.rs index ff0caa97..20fb412f 100644 --- a/tests/zip.rs +++ b/tests/zip.rs @@ -18,7 +18,7 @@ fn test_zip_no_shuffle() { let res = stream1.zip(stream2).collect_vec(); env.execute_blocking(); if let Some(res) = res.get() { - let expected = items1.into_iter().zip(items2.into_iter()).collect_vec(); + let expected = items1.into_iter().zip(items2).collect_vec(); assert_eq!(res, expected); } });