diff --git a/Cargo.lock b/Cargo.lock index 345fff8849..8b4fc417c7 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -138,9 +138,9 @@ checksum = "4b46cbb362ab8752921c97e041f5e366ee6297bd428a31275b9fcf1e380f7299" [[package]] name = "anstream" -version = "0.5.0" +version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1f58811cfac344940f1a400b6e6231ce35171f614f26439e80f8c1465c5cc0c" +checksum = "2ab91ebe16eb252986481c5b62f6098f3b698a45e34b5b98200cf20dd2484a44" dependencies = [ "anstyle", "anstyle-parse", @@ -152,15 +152,15 @@ dependencies = [ [[package]] name = "anstyle" -version = "1.0.3" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b84bf0a05bbb2a83e5eb6fa36bb6e87baa08193c35ff52bbf6b38d8af2890e46" +checksum = "7079075b41f533b8c61d2a4d073c4676e1f8b249ff94a393b0595db304e0dd87" [[package]] name = "anstyle-parse" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "938874ff5980b03a87c5524b3ae5b59cf99b1d6bc836848df7bc5ada9643c333" +checksum = "317b9a89c1868f5ea6ff1d9539a69f45dffc21ce321ac1fd1160dfa48c8e2140" dependencies = [ "utf8parse", ] @@ -176,9 +176,9 @@ dependencies = [ [[package]] name = "anstyle-wincon" -version = "2.1.0" +version = "3.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58f54d10c6dfa51283a066ceab3ec1ab78d13fae00aa49243a45e4571fb79dfd" +checksum = "f0699d10d2f4d628a98ee7b57b289abbc98ff3bad977cb3152709d4bf2330628" dependencies = [ "anstyle", "windows-sys 0.48.0", @@ -268,18 +268,19 @@ dependencies = [ [[package]] name = "async-dup" -version = "1.2.3" +version = "1.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "865d94538a2d4f7197f9e08daf94203c06be78fe87a9d293ba4dd718028c5783" +checksum = "7427a12b8dc09291528cfb1da2447059adb4a257388c2acd6497a79d55cf6f7c" dependencies = [ "futures-io", + "simple-mutex", ] [[package]] name = "async-executor" -version = "1.5.3" +version = "1.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78f2db9467baa66a700abce2a18c5ad793f6f83310aca1284796fc3921d113fd" +checksum = "2c1da3ae8dabd9c00f453a329dfe1fb28da3c0a72e2478cdcd93171740c20499" dependencies = [ "async-lock", "async-task", @@ -334,7 +335,7 @@ dependencies = [ "log", "parking", "polling", - "rustix 0.37.23", + "rustix 0.37.24", "slab", "socket2 0.4.9", "waker-fn", @@ -351,9 +352,9 @@ dependencies = [ [[package]] name = "async-process" -version = "1.8.0" +version = "1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf012553ce51eb7aa6dc2143804cc8252bd1cb681a1c5cb7fa94ca88682dee1d" +checksum = "ea6438ba0a08d81529c69b36700fa2f95837bfe3e776ab39cde9c14d9149da88" dependencies = [ "async-io", "async-lock", @@ -362,24 +363,23 @@ dependencies = [ "cfg-if", "event-listener 3.0.0", "futures-lite", - "rustix 0.38.14", + "rustix 0.38.17", "windows-sys 0.48.0", ] [[package]] name = "async-signal" -version = "0.2.1" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4af361a844928cb7d36590d406709473a1b574f443094422ef166daa3b493208" +checksum = "1079d27511f6c038736279421774ef4ad4bdd2e300825f4a48c4cc463a57cedf" dependencies = [ "async-io", "async-lock", "atomic-waker", "cfg-if", - "concurrent-queue", "futures-core", "futures-io", - "libc", + "rustix 0.38.17", "signal-hook-registry", "slab", "windows-sys 0.48.0", @@ -445,7 +445,7 @@ checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193" dependencies = [ "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.38", ] [[package]] @@ -475,7 +475,7 @@ checksum = "bc00ceb34980c03614e35a3a4e218276a0a824e911d07651cd0d858a51e8c0f0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.38", ] [[package]] @@ -569,7 +569,7 @@ dependencies = [ "hex", "http", "hyper", - "ring", + "ring 0.16.20", "time 0.3.29", "tokio", "tower", @@ -634,9 +634,9 @@ dependencies = [ [[package]] name = "aws-sdk-s3" -version = "0.30.0" +version = "0.33.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a531d010f9f556bf65eb3bcd8d24f1937600ab6940fede4d454cd9b1f031fb34" +checksum = "73018483d9cb78e1a0d4dcbc94327b01d532e7cb28f26c5bceff97f8f0e4c6eb" dependencies = [ "aws-credential-types", "aws-http", @@ -1061,9 +1061,9 @@ dependencies = [ [[package]] name = "blocking" -version = "1.4.0" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94c4ef1f913d78636d78d538eec1f18de81e481f44b1be0a81060090530846e1" +checksum = "8c36a4d0d48574b3dd360b4b7d95cc651d2b6557b6402848a27d4b228a473e2a" dependencies = [ "async-channel", "async-lock", @@ -1104,9 +1104,9 @@ checksum = "7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec" [[package]] name = "byteorder" -version = "1.4.3" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" +checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "bytes" @@ -1287,9 +1287,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.4.5" +version = "4.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "824956d0dca8334758a5b7f7e50518d66ea319330cbceedcf76905c2f6ab30e3" +checksum = "d04704f56c2cde07f43e8e2c154b43f216dc5c92fc98ada720177362f953b956" dependencies = [ "clap_builder", "clap_derive", @@ -1297,9 +1297,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.4.5" +version = "4.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "122ec64120a49b4563ccaedcbea7818d069ed8e9aa6d829b82d8a4128936b2ab" +checksum = "0e231faeaca65ebd1ea3c737966bf858971cd38c3849107aa3ea7de90a804e45" dependencies = [ "anstream", "anstyle", @@ -1309,9 +1309,9 @@ dependencies = [ [[package]] name = "clap_complete" -version = "4.4.2" +version = "4.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8baeccdb91cd69189985f87f3c7e453a3a451ab5746cf3be6acc92120bd16d24" +checksum = "e3ae8ba90b9d8b007efe66e55e48fb936272f5ca00349b5b0e89877520d35ea7" dependencies = [ "clap", ] @@ -1325,7 +1325,7 @@ dependencies = [ "heck 0.4.1", "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.38", ] [[package]] @@ -1559,7 +1559,7 @@ dependencies = [ "clap", "criterion-plot", "is-terminal", - "itertools", + "itertools 0.10.5", "num-traits", "once_cell", "oorandom", @@ -1580,7 +1580,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6b50826342786a51a89e2da3a28f1c32b06e387201bc2d19791f622c673706b1" dependencies = [ "cast", - "itertools", + "itertools 0.10.5", ] [[package]] @@ -1689,9 +1689,9 @@ dependencies = [ [[package]] name = "csv" -version = "1.2.2" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "626ae34994d3d8d668f4269922248239db4ae42d538b14c398b74a52208e8086" +checksum = "ac574ff4d437a7b5ad237ef331c17ccca63c46479e5b5453eb8e10bb99a759fe" dependencies = [ "csv-core", "itoa 1.0.9", @@ -1701,9 +1701,9 @@ dependencies = [ [[package]] name = "csv-core" -version = "0.1.10" +version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b2466559f260f48ad25fe6317b3c8dac77b5bdb5763ac7d9d6103530663bc90" +checksum = "5efa2b3d7902f4b634a20cae3c9c4e6209dc4779feb6863329607560143efa70" dependencies = [ "memchr", ] @@ -1765,7 +1765,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "978747c1d849a7d2ee5e8adc0159961c48fb7e5db2f06af6723b80123bb53856" dependencies = [ "cfg-if", - "hashbrown 0.14.0", + "hashbrown 0.14.1", "lock_api", "once_cell", "parking_lot_core 0.9.8", @@ -1909,7 +1909,7 @@ version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1611d8efce6766178515e99dc2cd5727cd846acfc1649a750585af7187cbac00" dependencies = [ - "simd-json 0.11.1", + "simd-json", ] [[package]] @@ -1998,7 +1998,7 @@ dependencies = [ "heck 0.4.1", "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.38", ] [[package]] @@ -2031,25 +2031,14 @@ dependencies = [ [[package]] name = "errno" -version = "0.3.3" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "136526188508e25c6fef639d7927dfb3e0e3084488bf202267829cf7fc23dbdd" +checksum = "ac3e13f66a2f95e32a39eaa81f6b95d42878ca0e1db0c7543723dfe12557e860" dependencies = [ - "errno-dragonfly", "libc", "windows-sys 0.48.0", ] -[[package]] -name = "errno-dragonfly" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf" -dependencies = [ - "cc", - "libc", -] - [[package]] name = "error-chain" version = "0.12.4" @@ -2249,7 +2238,7 @@ checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" dependencies = [ "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.38", ] [[package]] @@ -2500,9 +2489,9 @@ dependencies = [ [[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" dependencies = [ "ahash", "allocator-api2", @@ -2822,12 +2811,12 @@ dependencies = [ [[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]] @@ -2902,7 +2891,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b" dependencies = [ "hermit-abi 0.3.3", - "rustix 0.38.14", + "rustix 0.38.17", "windows-sys 0.48.0", ] @@ -2915,6 +2904,15 @@ dependencies = [ "either", ] +[[package]] +name = "itertools" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1c173a5686ce8bfa551b3563d0c2170bf24ca44da99c7ca4bfdab5418c3fe57" +dependencies = [ + "either", +] + [[package]] name = "itoa" version = "0.4.8" @@ -2953,7 +2951,7 @@ checksum = "afabcc15e437a6484fc4f12d0fd63068fe457bf93f1c148d3d9649c60b103f32" dependencies = [ "base64 0.12.3", "pem", - "ring", + "ring 0.16.20", "serde", "serde_json", "simple_asn1", @@ -2989,12 +2987,12 @@ dependencies = [ "diff", "ena", "is-terminal", - "itertools", + "itertools 0.10.5", "lalrpop-util", "petgraph", "pico-args", "regex", - "regex-syntax 0.7.5", + "regex-syntax", "string_cache", "term", "tiny-keccak", @@ -3104,9 +3102,9 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.148" +version = "0.2.149" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9cdc71e17332e86d2e1d38c1f99edcb6288ee11b815fb1a4b049eaa2114d369b" +checksum = "a08173bc88b7955d1b3145aa561539096c421ac8debde8cbc3612ec635fee29b" [[package]] name = "libflate" @@ -3154,9 +3152,9 @@ dependencies = [ [[package]] name = "libm" -version = "0.2.7" +version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7012b1bbb0719e1097c47611d3898568c546d597c2e74d66f6087edd5233ff4" +checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058" [[package]] name = "libz-sys" @@ -3184,9 +3182,9 @@ checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" [[package]] name = "linux-raw-sys" -version = "0.4.7" +version = "0.4.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a9bad9f94746442c783ca431b22403b519cd7fbeed0533fdd6328b2f2212128" +checksum = "da2479e8c062e40bf0066ffa0bc823de0a9368974af99c9f6df941d2c231e03f" [[package]] name = "lock_api" @@ -3246,7 +3244,7 @@ version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a4a83fb7698b3643a0e34f9ae6f2e8f0178c0fd42f8b59d493aa271ff3a5bf21" dependencies = [ - "hashbrown 0.14.0", + "hashbrown 0.14.1", ] [[package]] @@ -3323,9 +3321,9 @@ dependencies = [ [[package]] name = "memchr" -version = "2.6.3" +version = "2.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f232d6ef707e1956a43342693d2a31e72989554d58299d7a88738cc95b0d35c" +checksum = "f665ee40bc4a3c5590afb1e9677db74a508659dfd71e126420da8274909a0167" [[package]] name = "memoffset" @@ -3485,9 +3483,9 @@ dependencies = [ [[package]] name = "num-traits" -version = "0.2.16" +version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f30b0abd723be7e2ffca1272140fac1a2f084c77ec3e123c192b66af1ee9e6c2" +checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c" dependencies = [ "autocfg", "libm", @@ -3602,7 +3600,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.38", ] [[package]] @@ -3763,7 +3761,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e1d3afd2628e69da2be385eb6f2fd57c8ac7977ceeff6dc166ff1657b0e386a9" dependencies = [ "fixedbitset", - "indexmap 2.0.0", + "indexmap 2.0.2", ] [[package]] @@ -3836,7 +3834,7 @@ checksum = "4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405" dependencies = [ "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.38", ] [[package]] @@ -3999,28 +3997,28 @@ checksum = "dc375e1527247fe1a97d8b7156678dfe7c1af2fc075c9a4db3690ecd2a148068" [[package]] name = "proc-macro2" -version = "1.0.67" +version = "1.0.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d433d9f1a3e8c1263d9456598b16fec66f4acc9a74dacffd35c7bb09b3a1328" +checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da" dependencies = [ "unicode-ident", ] [[package]] name = "proptest" -version = "1.2.0" +version = "1.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e35c06b98bf36aba164cc17cb25f7e232f5c4aeea73baa14b8a9f0d92dbfa65" +checksum = "7c003ac8c77cb07bb74f5f198bce836a689bcd5a42574612bf14d17bfd08c20e" dependencies = [ "bit-set", - "bitflags 1.3.2", - "byteorder", + "bit-vec", + "bitflags 2.4.0", "lazy_static", "num-traits", "rand 0.8.5", "rand_chacha 0.3.1", "rand_xorshift", - "regex-syntax 0.6.29", + "regex-syntax", "rusty-fork", "tempfile", "unarray", @@ -4044,7 +4042,7 @@ checksum = "62941722fb675d463659e49c4f3fe1fe792ff24fe5bbaa9c08cd3b98a1c354f5" dependencies = [ "bytes", "heck 0.3.3", - "itertools", + "itertools 0.10.5", "lazy_static", "log", "multimap", @@ -4063,7 +4061,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f9cc1a3263e07e0bf68e96268f37665207b49560d98739662cdfaae215c720fe" dependencies = [ "anyhow", - "itertools", + "itertools 0.10.5", "proc-macro2", "quote", "syn 1.0.109", @@ -4283,33 +4281,27 @@ dependencies = [ [[package]] name = "regex" -version = "1.9.5" +version = "1.9.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "697061221ea1b4a94a624f67d0ae2bfe4e22b8a17b6a192afb11046542cc8c47" +checksum = "ebee201405406dbf528b8b672104ae6d6d63e6d118cb10e4d51abbc7b58044ff" dependencies = [ "aho-corasick", "memchr", "regex-automata", - "regex-syntax 0.7.5", + "regex-syntax", ] [[package]] name = "regex-automata" -version = "0.3.8" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2f401f4955220693b56f8ec66ee9c78abffd8d1c4f23dc41a23839eb88f0795" +checksum = "59b23e92ee4318893fa3fe3e6fb365258efbfe6ac6ab30f090cdcbb7aa37efa9" dependencies = [ "aho-corasick", "memchr", - "regex-syntax 0.7.5", + "regex-syntax", ] -[[package]] -name = "regex-syntax" -version = "0.6.29" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" - [[package]] name = "regex-syntax" version = "0.7.5" @@ -4318,9 +4310,9 @@ checksum = "dbb5fb1acd8a1a18b3dd5be62d25485eb770e05afb408a9627d14d451bae12da" [[package]] name = "reqwest" -version = "0.11.20" +version = "0.11.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e9ad3fe7488d7e34558a2033d45a0c90b72d97b4f80705666fea71472e2e6a1" +checksum = "046cd98826c46c2ac8ddecae268eb5c2e58628688a5fc7a2643704a73faba95b" dependencies = [ "async-compression", "base64 0.21.4", @@ -4349,6 +4341,7 @@ dependencies = [ "serde", "serde_json", "serde_urlencoded 0.7.1", + "system-configuration", "tokio", "tokio-native-tls", "tokio-rustls 0.24.1", @@ -4382,12 +4375,26 @@ dependencies = [ "cc", "libc", "once_cell", - "spin", - "untrusted", + "spin 0.5.2", + "untrusted 0.7.1", "web-sys", "winapi", ] +[[package]] +name = "ring" +version = "0.17.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "911b295d2d302948838c8ac142da1ee09fa7863163b44e6715bc9357905878b8" +dependencies = [ + "cc", + "getrandom 0.2.10", + "libc", + "spin 0.9.8", + "untrusted 0.9.0", + "windows-sys 0.48.0", +] + [[package]] name = "rle-decode-fast" version = "1.0.3" @@ -4444,13 +4451,13 @@ dependencies = [ [[package]] name = "rust_tokenizers" -version = "8.1.0" +version = "8.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f367f6b13bc686e822237b97caeb4b2e366dd1936ec204f11d266ede402c31b" +checksum = "19599f60a688b5160247ee9c37a6af8b0c742ee8b160c5b44acc0f0eb265a59f" dependencies = [ "csv", - "hashbrown 0.13.2", - "itertools", + "hashbrown 0.14.1", + "itertools 0.11.0", "lazy_static", "protobuf", "rayon", @@ -4488,9 +4495,9 @@ dependencies = [ [[package]] name = "rustix" -version = "0.37.23" +version = "0.37.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d69718bf81c6127a49dc64e44a742e8bb9213c0ff8869a22c308f84c1d4ab06" +checksum = "4279d76516df406a8bd37e7dff53fd37d1a093f997a3c34a5c21658c126db06d" dependencies = [ "bitflags 1.3.2", "errno", @@ -4502,14 +4509,14 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.14" +version = "0.38.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "747c788e9ce8e92b12cd485c49ddf90723550b654b32508f979b71a7b1ecda4f" +checksum = "f25469e9ae0f3d0047ca8b93fc56843f38e6774f0914a107ff8b41be8be8e0b7" dependencies = [ "bitflags 2.4.0", "errno", "libc", - "linux-raw-sys 0.4.7", + "linux-raw-sys 0.4.10", "windows-sys 0.48.0", ] @@ -4521,7 +4528,7 @@ checksum = "5d1126dcf58e93cee7d098dbda643b5f92ed724f1f6a63007c1116eed6700c81" dependencies = [ "base64 0.12.3", "log", - "ring", + "ring 0.16.20", "sct 0.6.1", "webpki 0.21.4", ] @@ -4534,7 +4541,7 @@ checksum = "35edb675feee39aec9c99fa5ff985081995a06d594114ae14cbe797ad7b7a6d7" dependencies = [ "base64 0.13.1", "log", - "ring", + "ring 0.16.20", "sct 0.6.1", "webpki 0.21.4", ] @@ -4546,9 +4553,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1b80e3dec595989ea8510028f30c408a4630db12c9cbb8de34203b89d6577e99" dependencies = [ "log", - "ring", + "ring 0.16.20", "sct 0.7.0", - "webpki 0.22.1", + "webpki 0.22.4", ] [[package]] @@ -4558,7 +4565,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cd8d6c9f025a446bc4d18ad9632e69aec8f287aa84499ee335599fabd20c3fd8" dependencies = [ "log", - "ring", + "ring 0.16.20", "rustls-webpki", "sct 0.7.0", ] @@ -4590,8 +4597,8 @@ version = "0.101.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3c7d5dece342910d9ba34d259310cae3e0154b873b35408b787b59bce53d34fe" dependencies = [ - "ring", - "untrusted", + "ring 0.16.20", + "untrusted 0.7.1", ] [[package]] @@ -4658,8 +4665,8 @@ version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b362b83898e0e69f38515b82ee15aa80636befe47c3b6d3d89a911e78fc228ce" dependencies = [ - "ring", - "untrusted", + "ring 0.16.20", + "untrusted 0.7.1", ] [[package]] @@ -4668,8 +4675,8 @@ version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d53dcdb7c9f8158937a7981b48accfd39a43af418591a5d008c7b22b5e1b7ca4" dependencies = [ - "ring", - "untrusted", + "ring 0.16.20", + "untrusted 0.7.1", ] [[package]] @@ -4743,7 +4750,7 @@ checksum = "4eca7ac642d82aa35b60049a6eccb4be6be75e599bd2e9adb5f875a737654af2" dependencies = [ "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.38", ] [[package]] @@ -4841,7 +4848,7 @@ version = "0.9.25" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1a49e178e4452f45cb61d0cd8cebc1b0fafd3e41929e996cef79aa3aca91f574" dependencies = [ - "indexmap 2.0.0", + "indexmap 2.0.2", "itoa 1.0.9", "ryu", "serde", @@ -4900,7 +4907,7 @@ checksum = "91d129178576168c589c9ec973feedf7d3126c01ac2bf08795109aa35b69fb8f" dependencies = [ "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.38", ] [[package]] @@ -5001,23 +5008,6 @@ dependencies = [ "tokio", ] -[[package]] -name = "simd-json" -version = "0.10.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80ea1dfc2c400965867fc4ddd6f502572be2de2074b39f90984ed15fbdbdd8eb" -dependencies = [ - "ahash", - "getrandom 0.2.10", - "halfbrown", - "lexical-core 0.8.5", - "once_cell", - "serde", - "serde_json", - "simdutf8", - "value-trait", -] - [[package]] name = "simd-json" version = "0.11.1" @@ -5044,7 +5034,7 @@ dependencies = [ "chrono", "itoa 1.0.9", "ryu", - "simd-json 0.11.1", + "simd-json", "simd-json-derive-int", "value-trait", ] @@ -5057,8 +5047,8 @@ checksum = "4c6bd11408bd50363eb2ada6dca003f1a27925edcf5715d66106fff9eaf23efa" dependencies = [ "proc-macro2", "quote", - "simd-json 0.11.1", - "syn 2.0.37", + "simd-json", + "syn 2.0.38", ] [[package]] @@ -5067,6 +5057,15 @@ version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f27f6278552951f1f2b8cf9da965d10969b2efdea95a6ec47987ab46edfe263a" +[[package]] +name = "simple-mutex" +version = "1.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38aabbeafa6f6dead8cebf246fe9fae1f9215c8d29b3a69f93bd62a9e4a3dcd6" +dependencies = [ + "event-listener 2.5.3", +] + [[package]] name = "simple_asn1" version = "0.4.1" @@ -5171,6 +5170,12 @@ version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" +[[package]] +name = "spin" +version = "0.9.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" + [[package]] name = "standback" version = "0.2.17" @@ -5279,7 +5284,7 @@ dependencies = [ "proc-macro2", "quote", "rustversion", - "syn 2.0.37", + "syn 2.0.38", ] [[package]] @@ -5314,15 +5319,15 @@ dependencies = [ [[package]] name = "sval" -version = "2.8.0" +version = "2.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05d11eec9fbe2bc8bc71e7349f0e7534db9a96d961fb9f302574275b7880ad06" +checksum = "e55089b73dfa822e1eb6b635f8795215512cca94bfae11aee3a1a06228bc88bb" [[package]] name = "sval_buffer" -version = "2.8.0" +version = "2.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b7451f69a93c5baf2653d5aa8bb4178934337f16c22830a50b06b386f72d761" +checksum = "df307823073d63f1fb126895439fead41afc493ea35d636cceedef9f6b32ba81" dependencies = [ "sval", "sval_ref", @@ -5330,18 +5335,18 @@ dependencies = [ [[package]] name = "sval_dynamic" -version = "2.8.0" +version = "2.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c34f5a2cc12b4da2adfb59d5eedfd9b174a23cc3fae84cec71dcbcd9302068f5" +checksum = "e5f8e4c4d6d028d3cbff66c2bb3d98181d031d312b7df4550eea7142d7036f37" dependencies = [ "sval", ] [[package]] name = "sval_fmt" -version = "2.8.0" +version = "2.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f578b2301341e246d00b35957f2952c4ec554ad9c7cfaee10bc86bc92896578" +checksum = "ad53f8eb502b0a3051fea001ae2e3723044699868ebfe06ea81b45545db392c2" dependencies = [ "itoa 1.0.9", "ryu", @@ -5350,9 +5355,9 @@ dependencies = [ [[package]] name = "sval_json" -version = "2.8.0" +version = "2.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8346c00f5dc6efe18bea8d13c1f7ca4f112b20803434bf3657ac17c0f74cbc4b" +checksum = "f913253c9f6cd27645ba9a0b6788039b5d4338eae0833c64b42ef178168d2862" dependencies = [ "itoa 1.0.9", "ryu", @@ -5361,18 +5366,18 @@ dependencies = [ [[package]] name = "sval_ref" -version = "2.8.0" +version = "2.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6617cc89952f792aebc0f4a1a76bc51e80c70b18c491bd52215c7989c4c3dd06" +checksum = "66a9661412d06740ebe81512a527b3d9220460eb7685f4399232c0e670108cb7" dependencies = [ "sval", ] [[package]] name = "sval_serde" -version = "2.8.0" +version = "2.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe3d1e59f023341d9af75d86f3bc148a6704f3f831eef0dd90bbe9cb445fa024" +checksum = "b8d077e98c1c8dfa466837ae0ec1e03c78138d42ac75662dac05e1bf0aebae20" dependencies = [ "serde", "sval", @@ -5393,9 +5398,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.37" +version = "2.0.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7303ef2c05cd654186cb250d29049a24840ca25d2747c25c0381c8d9e2f582e8" +checksum = "e96b79aaa137db8f61e26363a0c9b47d8b4ec75da28b7d1d614c2303e232408b" dependencies = [ "proc-macro2", "quote", @@ -5412,6 +5417,27 @@ dependencies = [ "nom 7.1.3", ] +[[package]] +name = "system-configuration" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba3a3adc5c275d719af8cb4272ea1c4a6d668a777f37e115f6d11ddbc1c8e0e7" +dependencies = [ + "bitflags 1.3.2", + "core-foundation", + "system-configuration-sys", +] + +[[package]] +name = "system-configuration-sys" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a75fb188eb626b924683e3b95e3a48e63551fcfb51949de2f06a9d91dbee93c9" +dependencies = [ + "core-foundation-sys", + "libc", +] + [[package]] name = "tar" version = "0.4.40" @@ -5455,7 +5481,7 @@ dependencies = [ "cfg-if", "fastrand 2.0.1", "redox_syscall 0.3.5", - "rustix 0.38.14", + "rustix 0.38.17", "windows-sys 0.48.0", ] @@ -5498,7 +5524,7 @@ dependencies = [ "proc-macro-error", "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.38", ] [[package]] @@ -5510,7 +5536,7 @@ dependencies = [ "proc-macro-error", "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.38", "test-case-core", ] @@ -5535,22 +5561,22 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.48" +version = "1.0.49" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d6d7a740b8a666a7e828dd00da9c0dc290dff53154ea77ac109281de90589b7" +checksum = "1177e8c6d7ede7afde3585fd2513e611227efd6481bd78d2e82ba1ce16557ed4" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.48" +version = "1.0.49" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49922ecae66cc8a249b77e68d1d0623c1b2c514f0060c27cdc68bd62a1219d35" +checksum = "10712f02019e9288794769fba95cd6847df9874d49d871d062172f9dd41bc4cc" dependencies = [ "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.38", ] [[package]] @@ -5697,9 +5723,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.32.0" +version = "1.33.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17ed6077ed6cd6c74735e21f37eb16dc3935f96878b1fe961074089cc80893f9" +checksum = "4f38200e3ef7995e5ef13baec2f432a6da0aa9ac495b2c0e8f3b7eec2c92d653" dependencies = [ "backtrace", "bytes", @@ -5732,7 +5758,7 @@ checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.38", ] [[package]] @@ -5764,7 +5790,7 @@ checksum = "c43ee83903113e03984cb9e5cebe6c04a5116269e900e3ddba8f068a62adda59" dependencies = [ "rustls 0.20.9", "tokio", - "webpki 0.22.1", + "webpki 0.22.4", ] [[package]] @@ -5840,7 +5866,7 @@ version = "0.19.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" dependencies = [ - "indexmap 2.0.0", + "indexmap 2.0.2", "toml_datetime", "winnow", ] @@ -5954,7 +5980,7 @@ checksum = "5f4f31f56159e98206da9efd823404b79b6ef3143b4a7ab76e67b1751b25a4ab" dependencies = [ "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.38", ] [[package]] @@ -5986,7 +6012,7 @@ dependencies = [ "log", "serde", "serde_yaml 0.9.25", - "simd-json 0.11.1", + "simd-json", "surf", "tide", "tokio", @@ -6024,7 +6050,7 @@ dependencies = [ "shell-words", "signal-hook", "signal-hook-tokio", - "simd-json 0.11.1", + "simd-json", "snmalloc-rs", "surf", "tch", @@ -6048,7 +6074,7 @@ dependencies = [ "beef", "rand 0.8.5", "serde", - "simd-json 0.11.1", + "simd-json", "simd-json-derive", "tokio", "url", @@ -6061,19 +6087,19 @@ dependencies = [ "criterion", "lexical", "pretty_assertions", - "simd-json 0.11.1", + "simd-json", "snmalloc-rs", "value-trait", ] [[package]] name = "tremor-kv" -version = "0.6.0" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ca20240378486f81a13354fc9beb180fd9d65ee469d90419ddad520ee5169b2" +checksum = "58f4167091558a2c0a46b183cf1a005b1e9e0e1aaeb365ad8d0847685ffc8542" dependencies = [ "serde", - "simd-json 0.10.7", + "simd-json", ] [[package]] @@ -6098,7 +6124,7 @@ dependencies = [ "either", "error-chain", "halfbrown", - "indexmap 2.0.0", + "indexmap 2.0.2", "lazy_static", "log", "lru", @@ -6108,7 +6134,7 @@ dependencies = [ "rust-bert", "serde", "serde_yaml 0.9.25", - "simd-json 0.11.1", + "simd-json", "simd-json-derive", "sled", "tempfile", @@ -6160,7 +6186,7 @@ dependencies = [ "gouth", "grok", "halfbrown", - "hashbrown 0.14.0", + "hashbrown 0.14.1", "hdrhistogram", "hex", "hostname", @@ -6169,7 +6195,7 @@ dependencies = [ "http-types", "hyper", "hyper-rustls", - "indexmap 2.0.0", + "indexmap 2.0.2", "itoa 1.0.9", "lazy_static", "lexical", @@ -6203,7 +6229,7 @@ dependencies = [ "serial_test", "signal-hook", "signal-hook-tokio", - "simd-json 0.11.1", + "simd-json", "simd-json-derive", "simdutf8", "sled", @@ -6267,7 +6293,7 @@ dependencies = [ "regex", "serde", "sha2 0.10.8", - "simd-json 0.11.1", + "simd-json", "simd-json-derive", "sketches-ddsketch", "strip-ansi-escapes", @@ -6296,7 +6322,7 @@ dependencies = [ "proptest", "serde", "serde_json", - "simd-json 0.11.1", + "simd-json", "simd-json-derive", "tremor-common", "value-trait", @@ -6372,7 +6398,7 @@ dependencies = [ "thiserror", "url", "utf-8", - "webpki 0.22.1", + "webpki 0.22.4", ] [[package]] @@ -6520,6 +6546,12 @@ version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a" +[[package]] +name = "untrusted" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" + [[package]] name = "url" version = "2.4.1" @@ -6719,7 +6751,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.38", "wasm-bindgen-shared", ] @@ -6753,7 +6785,7 @@ checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.38", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -6793,18 +6825,18 @@ version = "0.21.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b8e38c0608262c46d4a56202ebabdeb094cef7e560ca7a226c6bf055188aa4ea" dependencies = [ - "ring", - "untrusted", + "ring 0.16.20", + "untrusted 0.7.1", ] [[package]] name = "webpki" -version = "0.22.1" +version = "0.22.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0e74f82d49d545ad128049b7e88f6576df2da6b02e9ce565c6f533be576957e" +checksum = "ed63aea5ce73d0ff405984102c42de94fc55a6b75765d621c65262469b3c9b53" dependencies = [ - "ring", - "untrusted", + "ring 0.17.2", + "untrusted 0.9.0", ] [[package]] @@ -6831,7 +6863,7 @@ version = "0.22.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b6c71e40d7d2c34a5106301fb632274ca37242cd0c9d3e64dbece371a40a2d87" dependencies = [ - "webpki 0.22.1", + "webpki 0.22.4", ] [[package]] @@ -6849,7 +6881,7 @@ dependencies = [ "either", "home", "once_cell", - "rustix 0.38.14", + "rustix 0.38.17", ] [[package]] @@ -7046,9 +7078,9 @@ checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] name = "winnow" -version = "0.5.15" +version = "0.5.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c2e3184b9c4e92ad5167ca73039d0c42476302ab603e2fec4487511f38ccefc" +checksum = "037711d82167854aff2018dfd193aa0fef5370f456732f0d5a0c59b0f1b4b907" dependencies = [ "memchr", ] @@ -7074,9 +7106,9 @@ dependencies = [ [[package]] name = "xmlparser" -version = "0.13.5" +version = "0.13.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d25c75bf9ea12c4040a97f829154768bbbce366287e2dc044af160cd79a13fd" +checksum = "66fee0b777b0f5ac1c69bb06d361268faafa61cd4682ae064a171c16c433e9e4" [[package]] name = "xz2" @@ -7120,7 +7152,7 @@ checksum = "56097d5b91d711293a42be9289403896b68654625021732067eac7a4ca388a1f" dependencies = [ "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.38", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index 59340aa375..e3e3a09157 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -183,7 +183,7 @@ prost-types = "0.9.0" tremor-otelapis = { version = "=0.2.4" } # aws-s3 -aws-sdk-s3 = "0.30" +aws-sdk-s3 = "0.33" aws-types = "0.56" aws-config = "0.56" aws-smithy-http = "0.56" diff --git a/Dockerfile b/Dockerfile index 23b4d21f40..e21b5dd546 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM rust:1.72-bullseye as builder +FROM rust:1.73-bullseye as builder # Avoid warnings by switching to noninteractive ENV DEBIAN_FRONTEND=noninteractive diff --git a/Dockerfile.learn b/Dockerfile.learn index 07df32bd06..08d982c647 100644 --- a/Dockerfile.learn +++ b/Dockerfile.learn @@ -1,4 +1,4 @@ -FROM rust:1.72-bullseye as builder +FROM rust:1.73-bullseye as builder RUN cargo install --features=ssl websocat diff --git a/Dockerfile.native b/Dockerfile.native index 8e323b82da..421eb6676f 100644 --- a/Dockerfile.native +++ b/Dockerfile.native @@ -1,4 +1,4 @@ -FROM rust:1.72-bullseye as builder +FROM rust:1.73-bullseye as builder # Avoid warnings by switching to noninteractive ENV DEBIAN_FRONTEND=noninteractive diff --git a/rust-toolchain b/rust-toolchain index 0834888f55..5e3a425662 100644 --- a/rust-toolchain +++ b/rust-toolchain @@ -1 +1 @@ -1.72.0 +1.73.0 diff --git a/src/codec/tremor.rs b/src/codec/tremor.rs index 217f54e171..dbc575ac3c 100644 --- a/src/codec/tremor.rs +++ b/src/codec/tremor.rs @@ -420,6 +420,8 @@ mod test { } proptest! { #[test] + #[allow(clippy::ignored_unit_patterns)] + fn prop_round_trip(v1 in arb_tremor_value()) { let mut v: Vec = Vec::new(); Tremor::encode(&v1, &mut v).expect("failed to encode"); diff --git a/src/connectors/impls/crononome/handler.rs b/src/connectors/impls/crononome/handler.rs index 67c0e16615..ad3051d9d6 100644 --- a/src/connectors/impls/crononome/handler.rs +++ b/src/connectors/impls/crononome/handler.rs @@ -99,7 +99,7 @@ impl PartialEq for TemporalItem { impl PartialOrd for TemporalItem { fn partial_cmp(&self, other: &Self) -> Option { - self.at.partial_cmp(&other.at) + Some(self.at.cmp(&other.at)) } } diff --git a/src/connectors/impls/gcl.rs b/src/connectors/impls/gcl.rs index 4d1ead1f86..fea212602d 100644 --- a/src/connectors/impls/gcl.rs +++ b/src/connectors/impls/gcl.rs @@ -253,8 +253,7 @@ //! end; //! deploy flow main; //! ``` - -use rand::Rng; +use tremor_common::rand; use tremor_script::{tremor_fn, Registry}; use tremor_value::Value; @@ -265,21 +264,11 @@ pub(crate) mod writer; // uses: a 16-character hexadecimal encoding of an 8-byte array, // such as 000000000000004a fn random_span_id_value(ingest_ns_seed: u64) -> Value<'static> { - let mut rng = tremor_common::rand::make_prng(ingest_ns_seed); - let span_id: String = (0..8) - .map(|_| rng.gen::()) - .map(|b| format!("{b:02x}")) - .collect(); - Value::from(span_id) + Value::from(tremor_common::rand::octet_string(8, ingest_ns_seed)) } fn random_trace_id_value(ingest_ns_seed: u64) -> Value<'static> { - let mut rng = tremor_common::rand::make_prng(ingest_ns_seed); - let span_id: String = (0..16) - .map(|_| rng.gen::()) - .map(|b| format!("{b:02x}")) - .collect(); - Value::from(span_id) + Value::from(rand::octet_string(16, ingest_ns_seed)) } /// Extend function registry with `GCP Cloud Logging` support diff --git a/src/connectors/impls/kafka/consumer.rs b/src/connectors/impls/kafka/consumer.rs index a09955f289..08fe7ecc1d 100644 --- a/src/connectors/impls/kafka/consumer.rs +++ b/src/connectors/impls/kafka/consumer.rs @@ -385,7 +385,7 @@ impl ConsumerContext for TremorRDKafkaContext { offsets: &rdkafka::TopicPartitionList, ) { match result { - Ok(_) => { + Ok(()) => { if offsets.count() > 0 { debug!("{} Offsets committed successfully", &self.ctx); if log_enabled!(Debug) { @@ -995,7 +995,7 @@ impl TopicResolver { #[cfg(test)] mod test { - + #![allow(clippy::ignored_unit_patterns)] use super::{Config, Offset, TopicResolver}; use crate::errors::Result; use proptest::prelude::*; diff --git a/src/connectors/impls/otel/id.rs b/src/connectors/impls/otel/id.rs index 94a347e28b..c2a5184a06 100644 --- a/src/connectors/impls/otel/id.rs +++ b/src/connectors/impls/otel/id.rs @@ -15,8 +15,10 @@ #![allow(dead_code)] use crate::errors::Result; -use rand::Rng; +use ::rand::Rng; use simd_json::ValueAccess; +use std::fmt::Write; +use tremor_common::rand; use tremor_value::Value; pub(crate) fn random_span_id_bytes(ingest_ns_seed: u64) -> Vec { @@ -26,12 +28,7 @@ pub(crate) fn random_span_id_bytes(ingest_ns_seed: u64) -> Vec { } pub(crate) fn random_span_id_string(ingest_ns_seed: u64) -> String { - let mut rng = tremor_common::rand::make_prng(ingest_ns_seed); - let span_id: String = (0..8) - .map(|_| rng.gen_range(0_u8..=255_u8)) - .map(|b| format!("{b:02x}")) - .collect(); - span_id + rand::octet_string(8, ingest_ns_seed) } pub(crate) fn random_span_id_array(ingest_ns_seed: u64) -> Value<'static> { @@ -52,12 +49,7 @@ pub(crate) fn random_trace_id_bytes(ingest_ns_seed: u64) -> Vec { } pub(crate) fn random_trace_id_string(ingest_ns_seed: u64) -> String { - let mut rng = tremor_common::rand::make_prng(ingest_ns_seed); - let span_id: String = (0..16) - .map(|_| rng.gen_range(0_u8..=255_u8)) - .map(|b| format!("{b:02x}")) - .collect(); - span_id + tremor_common::rand::octet_string(16, ingest_ns_seed) } pub(crate) fn random_trace_id_value(ingest_ns_seed: u64) -> Value<'static> { @@ -79,20 +71,18 @@ pub(crate) fn hex_span_id_to_pb(data: Option<&Value<'_>>) -> Result> { hex_id_to_pb("span", data, 8, false) } -pub(crate) fn hex_span_id_to_json(data: &[u8]) -> Value<'static> { - let hex: String = data.iter().map(|b| format!("{b:02x}")).collect(); - Value::from(hex) +pub(crate) fn hex_id_to_json(data: &[u8]) -> Value<'static> { + Value::from(data.iter().fold(String::new(), |mut o, b| { + // ALLOW: if we can't allocate it's worse, we'd have the same problem with format + let _ = write!(o, "{b:02x}"); + o + })) } pub(crate) fn hex_trace_id_to_pb(data: Option<&Value<'_>>) -> Result> { hex_id_to_pb("trace", data, 16, false) } -pub(crate) fn hex_trace_id_to_json(data: &[u8]) -> Value<'static> { - let hex: String = data.iter().map(|b| format!("{b:02x}")).collect(); - Value::from(hex) -} - fn hex_id_to_pb( kind: &str, data: Option<&Value<'_>>, @@ -119,40 +109,23 @@ fn hex_id_to_pb( #[cfg(test)] pub mod test { + #![allow(clippy::ignored_unit_patterns)] use super::*; use proptest::prelude::*; use proptest::proptest; - pub(crate) fn pb_span_id_to_json(pb: &[u8]) -> Value { - let hex: String = pb.iter().map(|b| format!("{b:02x}")).collect(); - Value::String(hex.into()) - } - - pub(crate) fn json_span_id_to_pb(json: Option<&Value<'_>>) -> Result> { - hex_span_id_to_pb(json) - } - - pub(crate) fn pb_trace_id_to_json(pb: &[u8]) -> Value { - let hex: String = pb.iter().map(|b| format!("{b:02x}")).collect(); - Value::String(hex.into()) - } - - pub(crate) fn json_trace_id_to_pb(json: Option<&Value<'_>>) -> Result> { - hex_trace_id_to_pb(json) - } - #[test] fn test_utilities() -> Result<()> { let nanos = tremor_common::time::nanotime(); let span_bytes = random_span_id_bytes(nanos); let trace_bytes = random_trace_id_bytes(nanos); - let span_json = pb_span_id_to_json(&span_bytes); - let trace_json = pb_trace_id_to_json(&trace_bytes); + let span_json = hex_id_to_json(&span_bytes); + let trace_json = hex_id_to_json(&trace_bytes); - let span_pb = json_span_id_to_pb(Some(&span_json))?; - let trace_pb = json_trace_id_to_pb(Some(&trace_json))?; + let span_pb = hex_span_id_to_pb(Some(&span_json))?; + let trace_pb = hex_trace_id_to_pb(Some(&trace_json))?; assert_eq!(span_bytes, span_pb); assert_eq!(trace_bytes, trace_pb); @@ -160,14 +133,14 @@ pub mod test { let span_array = random_span_id_array(nanos); let trace_array = random_trace_id_array(nanos); - let span_pb = json_span_id_to_pb(Some(&span_array))?; - let trace_pb = json_trace_id_to_pb(Some(&trace_array))?; + let span_pb = hex_span_id_to_pb(Some(&span_array))?; + let trace_pb = hex_trace_id_to_pb(Some(&trace_array))?; - let span_json = pb_span_id_to_json(&span_pb); - let trace_json = pb_span_id_to_json(&trace_pb); + let span_json = hex_id_to_json(&span_pb); + let trace_json = hex_id_to_json(&trace_pb); - let span_pb2 = json_span_id_to_pb(Some(&span_json))?; - let trace_pb2 = json_trace_id_to_pb(Some(&trace_json))?; + let span_pb2 = hex_span_id_to_pb(Some(&span_json))?; + let trace_pb2 = hex_trace_id_to_pb(Some(&trace_json))?; assert_eq!(span_pb2, span_pb); assert_eq!(trace_pb2, trace_pb); diff --git a/src/connectors/impls/otel/logs.rs b/src/connectors/impls/otel/logs.rs index acb891bbbf..7427c3ec01 100644 --- a/src/connectors/impls/otel/logs.rs +++ b/src/connectors/impls/otel/logs.rs @@ -58,8 +58,8 @@ fn log_record_to_json(log: LogRecord) -> Result> { "severity_number": affirm_severity_number_valid(log.severity_number)?, "severity_text": log.severity_text.to_string(), "flags": affirm_traceflags_valid(log.flags)?, - "span_id": id::hex_span_id_to_json(&log.span_id), - "trace_id": id::hex_trace_id_to_json(&log.trace_id), + "span_id": id::hex_id_to_json(&log.span_id), + "trace_id": id::hex_id_to_json(&log.trace_id), "attributes": common::key_value_list_to_json(log.attributes), "dropped_attributes_count": log.dropped_attributes_count, "body": common::maybe_any_value_to_json(log.body), @@ -198,9 +198,9 @@ mod tests { fn instrumentation_library_logs() -> Result<()> { let nanos = tremor_common::time::nanotime(); let span_id_pb = id::random_span_id_bytes(nanos); - let span_id_json = id::test::pb_span_id_to_json(&span_id_pb); + let span_id_json = id::hex_id_to_json(&span_id_pb); let trace_id_json = id::random_trace_id_value(nanos); - let trace_id_pb = id::test::json_trace_id_to_pb(Some(&trace_id_json))?; + let trace_id_pb = id::hex_trace_id_to_pb(Some(&trace_id_json))?; let pb = vec![InstrumentationLibraryLogs { schema_url: "schema_url".into(), @@ -253,9 +253,9 @@ mod tests { fn resource_logs() -> Result<()> { let nanos = tremor_common::time::nanotime(); let span_id_pb = id::random_span_id_bytes(nanos); - let span_id_json = id::test::pb_span_id_to_json(&span_id_pb); + let span_id_json = id::hex_id_to_json(&span_id_pb); let trace_id_json = id::random_trace_id_value(nanos); - let trace_id_pb = id::test::json_trace_id_to_pb(Some(&trace_id_json))?; + let trace_id_pb = id::hex_trace_id_to_pb(Some(&trace_id_json))?; let pb = ExportLogsServiceRequest { resource_logs: vec![ResourceLogs { @@ -326,9 +326,9 @@ mod tests { fn resource_logs_severity_unspecified_regression() -> Result<()> { let nanos = tremor_common::time::nanotime(); let span_id_pb = id::random_span_id_bytes(nanos); - let span_id_json = id::test::pb_span_id_to_json(&span_id_pb); + let span_id_json = id::hex_id_to_json(&span_id_pb); let trace_id_json = id::random_trace_id_value(nanos); - let trace_id_pb = id::test::json_trace_id_to_pb(Some(&trace_id_json))?; + let trace_id_pb = id::hex_trace_id_to_pb(Some(&trace_id_json))?; let pb = ExportLogsServiceRequest { resource_logs: vec![ResourceLogs { diff --git a/src/connectors/impls/otel/metrics.rs b/src/connectors/impls/otel/metrics.rs index 7081a56e65..e4e633c34f 100644 --- a/src/connectors/impls/otel/metrics.rs +++ b/src/connectors/impls/otel/metrics.rs @@ -40,8 +40,8 @@ pub(crate) fn int_exemplars_to_json(data: Vec) -> Value<'static> { data.into_iter() .map(|exemplar| { literal!({ - "span_id": id::hex_span_id_to_json(&exemplar.span_id), - "trace_id": id::hex_trace_id_to_json(&exemplar.trace_id), + "span_id": id::hex_id_to_json(&exemplar.span_id), + "trace_id": id::hex_id_to_json(&exemplar.trace_id), "filtered_labels": common::string_key_value_to_json(exemplar.filtered_labels), "time_unix_nano": exemplar.time_unix_nano, "value": exemplar.value @@ -83,8 +83,8 @@ pub(crate) fn double_exemplars_to_json(data: Vec) -> Value<'static> { }; let mut r = literal!({ - "span_id": id::hex_span_id_to_json(&exemplar.span_id), - "trace_id": id::hex_trace_id_to_json(&exemplar.trace_id), + "span_id": id::hex_id_to_json(&exemplar.span_id), + "trace_id": id::hex_id_to_json(&exemplar.trace_id), "filtered_attributes": filtered_attributes, "time_unix_nano": exemplar.time_unix_nano, }); @@ -583,9 +583,9 @@ mod tests { fn int_exemplars() -> Result<()> { let nanos = tremor_common::time::nanotime(); let span_id_pb = id::random_span_id_bytes(nanos); - let span_id_json = id::test::pb_span_id_to_json(&span_id_pb); + let span_id_json = id::hex_id_to_json(&span_id_pb); let trace_id_json = id::random_trace_id_value(nanos); - let trace_id_pb = id::test::json_trace_id_to_pb(Some(&trace_id_json))?; + let trace_id_pb = id::hex_trace_id_to_pb(Some(&trace_id_json))?; let pb = vec![IntExemplar { span_id: span_id_pb.clone(), @@ -620,9 +620,9 @@ mod tests { fn double_exemplars() -> Result<()> { let nanos = tremor_common::time::nanotime(); let span_id_pb = id::random_span_id_bytes(nanos); - let span_id_json = id::test::pb_span_id_to_json(&span_id_pb); + let span_id_json = id::hex_id_to_json(&span_id_pb); let trace_id_json = id::random_trace_id_value(nanos); - let trace_id_pb = id::test::json_trace_id_to_pb(Some(&trace_id_json))?; + let trace_id_pb = id::hex_trace_id_to_pb(Some(&trace_id_json))?; let pb = vec![Exemplar { filtered_attributes: vec![], diff --git a/src/connectors/impls/otel/trace.rs b/src/connectors/impls/otel/trace.rs index d8f6eab02a..6b264596e3 100644 --- a/src/connectors/impls/otel/trace.rs +++ b/src/connectors/impls/otel/trace.rs @@ -85,8 +85,8 @@ pub(crate) fn span_links_to_json(pb: Vec) -> Value<'static> { pb.into_iter() .map(|data| { literal!({ - "trace_id": id::hex_trace_id_to_json(&data.trace_id), - "span_id": id::hex_span_id_to_json(&data.span_id), + "trace_id": id::hex_id_to_json(&data.trace_id), + "span_id": id::hex_id_to_json(&data.span_id), "trace_state": data.trace_state, "attributes": common::key_value_list_to_json(data.attributes), "dropped_attributes_count" : data.dropped_attributes_count @@ -133,9 +133,9 @@ fn span_to_json(span: Span) -> Value<'static> { "attributes": common::key_value_list_to_json(span.attributes), "events": span_events_to_json(span.events), "links": span_links_to_json(span.links), - "span_id": id::hex_span_id_to_json(&span.span_id), - "parent_span_id": id::hex_span_id_to_json(&span.parent_span_id), - "trace_id": id::hex_trace_id_to_json(&span.trace_id), + "span_id": id::hex_id_to_json(&span.span_id), + "parent_span_id": id::hex_id_to_json(&span.parent_span_id), + "trace_id": id::hex_id_to_json(&span.trace_id), "start_time_unix_nano": span.start_time_unix_nano, "end_time_unix_nano": span.end_time_unix_nano, "trace_state": span.trace_state, @@ -343,9 +343,9 @@ mod tests { fn span_link() -> Result<()> { let nanotime = tremor_common::time::nanotime(); let span_id_pb = id::random_span_id_bytes(nanotime); - let span_id_json = id::test::pb_span_id_to_json(&span_id_pb); + let span_id_json = id::hex_id_to_json(&span_id_pb); let trace_id_json = id::random_trace_id_value(nanotime); - let trace_id_pb = id::test::json_trace_id_to_pb(Some(&trace_id_json))?; + let trace_id_pb = id::hex_trace_id_to_pb(Some(&trace_id_json))?; let pb = vec![Link { attributes: vec![], @@ -384,11 +384,11 @@ mod tests { fn instrument_library_spans() -> Result<()> { let nanotime = tremor_common::time::nanotime(); let parent_span_id_json = id::random_span_id_value(nanotime); - let parent_span_id_pb = id::test::json_span_id_to_pb(Some(&parent_span_id_json))?; + let parent_span_id_pb = id::hex_span_id_to_pb(Some(&parent_span_id_json))?; let span_id_pb = id::random_span_id_bytes(nanotime); - let span_id_json = id::test::pb_span_id_to_json(&span_id_pb); + let span_id_json = id::hex_id_to_json(&span_id_pb); let trace_id_json = id::random_trace_id_value(nanotime); - let trace_id_pb = id::test::json_trace_id_to_pb(Some(&trace_id_json))?; + let trace_id_pb = id::hex_trace_id_to_pb(Some(&trace_id_json))?; let pb = vec![InstrumentationLibrarySpans { schema_url: "schema_url".into(), @@ -460,11 +460,11 @@ mod tests { fn resource_spans() -> Result<()> { let nanotime = tremor_common::time::nanotime(); let parent_span_id_json = id::random_span_id_value(nanotime); - let parent_span_id_pb = id::test::json_span_id_to_pb(Some(&parent_span_id_json))?; + let parent_span_id_pb = id::hex_span_id_to_pb(Some(&parent_span_id_json))?; let span_id_pb = id::random_span_id_bytes(nanotime); - let span_id_json = id::test::pb_span_id_to_json(&span_id_pb); + let span_id_json = id::hex_id_to_json(&span_id_pb); let trace_id_json = id::random_trace_id_value(nanotime); - let trace_id_pb = id::test::json_trace_id_to_pb(Some(&trace_id_json))?; + let trace_id_pb = id::hex_trace_id_to_pb(Some(&trace_id_json))?; #[allow(deprecated)] let pb = ExportTraceServiceRequest { diff --git a/src/connectors/impls/ws/server.rs b/src/connectors/impls/ws/server.rs index 8faa4ecc88..ee9795cd76 100644 --- a/src/connectors/impls/ws/server.rs +++ b/src/connectors/impls/ws/server.rs @@ -186,7 +186,7 @@ impl Connector for WsServer { self.config .url .set_port(Some(port)) - .map_err(|_| "Invalid URL")?; + .map_err(|()| "Invalid URL")?; } let listener = tcp_server_socket( &self.config.url, diff --git a/src/connectors/source.rs b/src/connectors/source.rs index 7aa20a5516..28ea8975b9 100644 --- a/src/connectors/source.rs +++ b/src/connectors/source.rs @@ -684,7 +684,7 @@ where #[cfg(test)] SourceMsg::Synchronize(sender) => { self.ctx.swallow_err( - sender.send(()).map_err(|_| "send err"), + sender.send(()).map_err(|()| "send err"), "Error synchronizing with source ", ); Ok(Control::Continue) diff --git a/src/connectors/utils/pb.rs b/src/connectors/utils/pb.rs index b970bae346..a208ad5f3b 100644 --- a/src/connectors/utils/pb.rs +++ b/src/connectors/utils/pb.rs @@ -185,12 +185,11 @@ pub(crate) fn value_to_prost_struct(json: &Value<'_>) -> Result], alias: &Alias) -> Res #[cfg(test)] mod test { + #![allow(clippy::ignored_unit_patterns)] use super::*; use crate::postprocessor::{self as post, separate::Separate as SeparatePost, Postprocessor}; use crate::Result; diff --git a/tremor-cli/src/target_process.rs b/tremor-cli/src/target_process.rs index 77b1bf8edc..62c16f9273 100644 --- a/tremor-cli/src/target_process.rs +++ b/tremor-cli/src/target_process.rs @@ -16,7 +16,7 @@ use crate::errors::{Error, Result}; use std::collections::HashMap; use std::env; use std::ffi::OsStr; -use std::fmt::Display; +use std::fmt::{Display, Write}; use std::path::{Path, PathBuf}; use std::process::{ExitStatus, Stdio}; use tokio::io::{AsyncBufReadExt, AsyncRead, AsyncWriteExt, BufReader}; @@ -140,9 +140,11 @@ impl TargetProcess { .collect::>(); let cmdline = format!( "{}{} {}", - env.iter() - .map(|(k, v)| format!("{k}={v} ")) - .collect::(), + env.iter().fold(String::new(), |mut o, (k, v)| { + // ALLOW: if we can't allocate it's worse, we'd have the same problem with format + let _ = write!(o, "{k}={v} "); + o + }), cmd.to_string_lossy(), args.join(" ") ); diff --git a/tremor-cli/src/test/after.rs b/tremor-cli/src/test/after.rs index f30e4d2e1a..1121ae7cb6 100644 --- a/tremor-cli/src/test/after.rs +++ b/tremor-cli/src/test/after.rs @@ -16,6 +16,7 @@ use crate::errors::{Error, Result}; use crate::target_process; use crate::target_process::TargetProcess; use crate::util::slurp_string; +use std::fmt::Write; use std::path::PathBuf; use std::{collections::HashMap, fs, path::Path}; @@ -57,10 +58,11 @@ impl After { fn cmdline(&self) -> String { format!( "{}{} {}", - self.env - .iter() - .map(|(k, v)| format!("{k}={v} ")) - .collect::(), + self.env.iter().fold(String::new(), |mut o, (k, v)| { + // ALLOW: if we can't allocate it's worse, we'd have the same problem with format + let _ = write!(o, "{k}={v} "); + o + }), self.cmd, self.args.join(" ") ) diff --git a/tremor-cli/src/test/before.rs b/tremor-cli/src/test/before.rs index bb455d586d..6353d67409 100644 --- a/tremor-cli/src/test/before.rs +++ b/tremor-cli/src/test/before.rs @@ -15,10 +15,10 @@ use crate::errors::{Error, ErrorKind, Result}; use crate::util::slurp_string; use crate::{target_process, target_process::TargetProcess}; -use std::path::Path; -use std::path::PathBuf; +use std::path::{Path, PathBuf}; use std::{ collections::HashMap, + fmt::Write, fs, time::{self, Duration}, }; @@ -93,10 +93,11 @@ impl Before { fn cmdline(&self) -> String { format!( "{}{} {}", - self.env - .iter() - .map(|(k, v)| format!("{k}={v} ")) - .collect::(), + self.env.iter().fold(String::new(), |mut o, (k, v)| { + // ALLOW: if we can't allocate it's worse, we'd have the same problem with format + let _ = write!(o, "{k}={v} "); + o + }), self.cmd, self.args.join(" ") ) diff --git a/tremor-common/src/rand.rs b/tremor-common/src/rand.rs index ee9fa839a0..4105eb203d 100644 --- a/tremor-common/src/rand.rs +++ b/tremor-common/src/rand.rs @@ -12,10 +12,22 @@ // See the License for the specific language governing permissions and // limitations under the License. -use rand::{rngs::SmallRng, SeedableRng}; +use rand::{rngs::SmallRng, Rng, SeedableRng}; +use std::fmt::Write; /// Create a new random number generator - seed with `ingest_ns` from event context ( where appropriate ) #[must_use] pub fn make_prng(ingest_ns_seed: u64) -> SmallRng { SmallRng::seed_from_u64(ingest_ns_seed) } + +/// Generates a random octet string of `octet` * 2 ( an octet contains 2 characters) length +#[must_use] +pub fn octet_string(octets: usize, seed: u64) -> String { + let mut rng = crate::rand::make_prng(seed); + (0..octets).fold(String::new(), |mut o, _| { + // ALLOW: if we can't allocate it's worse, we'd have the same problem with format + let _ = write!(o, "{:02x}", rng.gen::()); + o + }) +} diff --git a/tremor-influx/src/encoder.rs b/tremor-influx/src/encoder.rs index c262f2f761..9d5cb8bc57 100644 --- a/tremor-influx/src/encoder.rs +++ b/tremor-influx/src/encoder.rs @@ -52,7 +52,7 @@ where for (key, value) in tag_collection { output.write_all(&[b','])?; - write_escaped_key(&mut output, key.borrow().as_bytes())?; + write_escaped_key(&mut output, key.as_bytes())?; output.write_all(&[b'='])?; // For the fields we escape differently then for values ... write_escaped_key(&mut output, value.as_bytes())?; @@ -75,7 +75,7 @@ where } else { output.write_all(&[b','])?; } - write_escaped_key(&mut output, key.borrow().as_bytes())?; + write_escaped_key(&mut output, key.as_bytes())?; output.write_all(&[b'='])?; if let Some(s) = value.as_str() { diff --git a/tremor-pipeline/src/query.rs b/tremor-pipeline/src/query.rs index 64bf276bcb..da6a1d3ccf 100644 --- a/tremor-pipeline/src/query.rs +++ b/tremor-pipeline/src/query.rs @@ -270,7 +270,7 @@ impl Query { let label = h .highlight_range(e) .ok() - .map(|_| h.to_string().trim_end().to_string()); + .map(|()| h.to_string().trim_end().to_string()); let select_in = InputPort { id: format!("select_{select_num}").into(), @@ -474,7 +474,7 @@ impl Query { let label = h .highlight_range(e) .ok() - .map(|_| format!("{}\n", h.to_string().trim_end())); + .map(|()| format!("{}\n", h.to_string().trim_end())); let that_defn = Stmt::ScriptDefinition(Box::new(defn)); let node = NodeConfig { diff --git a/tremor-script/src/errors.rs b/tremor-script/src/errors.rs index ef68248ffd..026744963f 100644 --- a/tremor-script/src/errors.rs +++ b/tremor-script/src/errors.rs @@ -17,6 +17,7 @@ #![allow(deprecated)] #![allow(missing_docs)] +use crate::errors::ErrorKind::InvalidBinaryBoolean; pub use crate::prelude::ValueType; use crate::{ arena, @@ -29,13 +30,12 @@ use crate::{ use error_chain::error_chain; use lalrpop_util::ParseError as LalrpopError; use simd_json::{ExtendedValueType, TryTypeError}; - -use crate::errors::ErrorKind::InvalidBinaryBoolean; +use std::fmt::Write; use std::ops::{Range as RangeExclusive, RangeInclusive}; use std::{fmt::Display, num}; #[derive(Debug)] -//// An error with a associated arena index +/// An error with a associated arena index pub struct ErrorWithIndex(pub arena::Index, pub Error); impl std::fmt::Display for ErrorWithIndex { @@ -737,7 +737,13 @@ error_chain! { description("Module not found") display("Module `{}` not found or not readable error in module path: {}", resolved_relative_file_path.trim(), - expected.iter().map(|x| format!("\n - {x}")).collect::()) + expected.iter().fold(String::new(), |mut output, x| + { + // ALLOW: if we can't allocate it's worse, we'd have the same problem with format +let _ = write!(output, "\n - {x}"); + output + + })) } diff --git a/tremor-script/src/interpreter.rs b/tremor-script/src/interpreter.rs index d1824cde3f..e322a04308 100644 --- a/tremor-script/src/interpreter.rs +++ b/tremor-script/src/interpreter.rs @@ -241,9 +241,7 @@ where { match val.as_usize() { Some(n) => Ok(n), - None if val.is_integer() => { - error_bad_array_index(outer, inner, path, val.borrow(), array.len()) - } + None if val.is_integer() => error_bad_array_index(outer, inner, path, val, array.len()), None => error_need_int(outer, inner, val.value_type()), } } diff --git a/tremor-script/src/lexer/test.rs b/tremor-script/src/lexer/test.rs index 4d068e78f4..3ffc233355 100644 --- a/tremor-script/src/lexer/test.rs +++ b/tremor-script/src/lexer/test.rs @@ -12,6 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. +#![allow(clippy::ignored_unit_patterns)] + use super::*; use matches::assert_matches; use proptest::prelude::*; diff --git a/tremor-script/src/std_lib/random.rs b/tremor-script/src/std_lib/random.rs index 4c344ce0a8..3026df60dd 100644 --- a/tremor-script/src/std_lib/random.rs +++ b/tremor-script/src/std_lib/random.rs @@ -195,6 +195,8 @@ pub fn load(registry: &mut Registry) { #[cfg(test)] mod test { + #![allow(clippy::ignored_unit_patterns)] + use crate::registry::fun; use crate::Value; use proptest::prelude::*; diff --git a/tremor-script/src/std_lib/stats.rs b/tremor-script/src/std_lib/stats.rs index a65d6457ba..905accd752 100644 --- a/tremor-script/src/std_lib/stats.rs +++ b/tremor-script/src/std_lib/stats.rs @@ -770,7 +770,8 @@ pub fn load_aggr(registry: &mut AggrRegistry) { #[cfg(test)] mod test { - #![allow(clippy::float_cmp)] + #![allow(clippy::float_cmp, clippy::ignored_unit_patterns)] + use super::*; use crate::registry::FResult as Result; use float_cmp::approx_eq; diff --git a/tremor-value/src/value.rs b/tremor-value/src/value.rs index e839f5a6bd..47ce63ba88 100644 --- a/tremor-value/src/value.rs +++ b/tremor-value/src/value.rs @@ -641,7 +641,8 @@ impl<'de> ValueDeserializer<'de> { #[cfg(test)] mod test { - #![allow(clippy::cognitive_complexity)] + #![allow(clippy::cognitive_complexity, clippy::ignored_unit_patterns)] + use super::*; use crate::literal; use proptest::proptest;