From 395d7bfc152599175000063ac9eda67a64c7e9d7 Mon Sep 17 00:00:00 2001 From: jmjoy Date: Wed, 2 Aug 2023 15:55:50 +0800 Subject: [PATCH 1/2] Upgrade dependencies. --- Cargo.lock | 878 ++++++++++++++------------------- Cargo.toml | 22 +- dist-material/LICENSE | 274 +++++----- scripts/Cargo.toml | 10 +- src/context.rs | 2 +- src/plugin/mod.rs | 4 +- src/plugin/plugin_amqplib.rs | 2 +- src/plugin/plugin_curl.rs | 4 +- src/plugin/plugin_memcached.rs | 2 +- src/plugin/plugin_mongodb.rs | 2 +- src/plugin/plugin_mysqli.rs | 2 +- src/plugin/plugin_pdo.rs | 2 +- src/plugin/plugin_predis.rs | 2 +- src/plugin/plugin_redis.rs | 2 +- src/request.rs | 2 +- src/worker.rs | 5 +- 16 files changed, 531 insertions(+), 684 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 49394f5..b92eaad 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4,9 +4,9 @@ version = 3 [[package]] name = "addr2line" -version = "0.19.0" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a76fd60b23679b7d19bd066031410fb7e458ccc5e958eb5c325888ce4baedc97" +checksum = "f4fa78e18c64fce05e902adecd7a5eed15a5e0a3439f7b0e169f0252214865e3" dependencies = [ "gimli", ] @@ -19,21 +19,18 @@ checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" [[package]] name = "aho-corasick" -version = "0.7.20" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc936419f96fa211c1b9166887b38e5e40b19958e5b895be7c1f93adec7071ac" +checksum = "43f6cb1bf222025340178f382c426f13757b2960e89779dfcb319c32542a5a41" dependencies = [ "memchr", ] [[package]] -name = "aho-corasick" -version = "1.0.1" +name = "android-tzdata" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67fc08ce920c31afb70f013dcce1bfc3a3195de6a228474e45e1f145b36f8d04" -dependencies = [ - "memchr", -] +checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0" [[package]] name = "android_system_properties" @@ -61,15 +58,15 @@ dependencies = [ [[package]] name = "anstyle" -version = "1.0.0" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41ed9a86bf92ae6580e0a31281f65a1b1d867c0cc68d5346e2ae128dddfa6a7d" +checksum = "3a30da5c5f2d5e72842e00bcb57657162cdabef0931f40e2deb9b4140440cecd" [[package]] name = "anstyle-parse" -version = "0.2.0" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e765fd216e48e067936442276d1d57399e37bce53c264d6fefbe298080cb57ee" +checksum = "938874ff5980b03a87c5524b3ae5b59cf99b1d6bc836848df7bc5ada9643c333" dependencies = [ "utf8parse", ] @@ -80,7 +77,7 @@ version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5ca11d4be1bab0c8bc8734a9aa7bf4ee8316d462a08c6ac5052f888fef5b494b" dependencies = [ - "windows-sys 0.48.0", + "windows-sys", ] [[package]] @@ -90,14 +87,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "180abfa45703aebe0093f79badacc01b8fd4ea2e35118747e5811127f926e188" dependencies = [ "anstyle", - "windows-sys 0.48.0", + "windows-sys", ] [[package]] name = "anyhow" -version = "1.0.71" +version = "1.0.72" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c7d0618f0e0b7e8ff11427422b64564d5fb0be1940354bfe2e0529b18a9d9b8" +checksum = "3b13c32d80ecc7ab747b80c3784bce54ee8a7a0cc4fbda9bf4cda2cf6fe90854" dependencies = [ "backtrace", ] @@ -121,18 +118,18 @@ checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193" dependencies = [ "proc-macro2", "quote", - "syn 2.0.18", + "syn 2.0.28", ] [[package]] name = "async-trait" -version = "0.1.68" +version = "0.1.72" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9ccdd8f2a161be9bd5c023df56f1b2a0bd1d83872ae53b71a84a12c9bf6e842" +checksum = "cc6dde6e4ed435a4c1ee4e73592f5ba9da2151af10076cc04858746af9352d09" dependencies = [ "proc-macro2", "quote", - "syn 2.0.18", + "syn 2.0.28", ] [[package]] @@ -143,13 +140,13 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" [[package]] name = "axum" -version = "0.6.18" +version = "0.6.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8175979259124331c1d7bf6586ee7e0da434155e4b2d48ec2c8386281d8df39" +checksum = "a6a1de45611fdb535bfde7b7de4fd54f4fd2b17b1737c0a59b69bf9b92074b8c" dependencies = [ "async-trait", "axum-core", - "bitflags", + "bitflags 1.3.2", "bytes", "futures-util", "http", @@ -192,9 +189,9 @@ dependencies = [ [[package]] name = "backtrace" -version = "0.3.67" +version = "0.3.68" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "233d376d6d185f2a3093e58f283f60f880315b6c60075b01f36b3b85154564ca" +checksum = "4319208da049c43661739c5fade2ba182f09d1dc2299b32298d3a31692b17e12" dependencies = [ "addr2line", "cc", @@ -213,9 +210,9 @@ checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" [[package]] name = "base64" -version = "0.21.0" +version = "0.21.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4a4ddaa51a5bc52a6948f74c06d20aaaddb71924eab79b8c97a8c556e942d6a" +checksum = "604178f6c5c21f02dc555784810edfb88d34ac2c73b2eae109655649ee73ce3d" [[package]] name = "bincode" @@ -232,7 +229,7 @@ version = "0.63.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "36d860121800b2a9a94f9b5604b332d5cffb234ce17609ea479d723dbc9d3885" dependencies = [ - "bitflags", + "bitflags 1.3.2", "cexpr", "clang-sys", "lazy_static", @@ -254,20 +251,26 @@ version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" +[[package]] +name = "bitflags" +version = "2.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "630be753d4e58660abd17930c71b647fe46c27ea6b63cc59e1e3851406972e42" + [[package]] name = "block-buffer" -version = "0.10.3" +version = "0.10.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69cce20737498f97b993470a6e536b8523f0af7892a4f928cceb1ac5e52ebe7e" +checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71" dependencies = [ "generic-array", ] [[package]] name = "bstr" -version = "1.1.0" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b45ea9b00a7b3f2988e9a65ad3917e62123c38dba709b666506207be96d1790b" +checksum = "6798148dccfbff0fae41c7574d2fa8f1ef3492fba0face179de5d8d447d67b05" dependencies = [ "memchr", "serde", @@ -275,9 +278,9 @@ dependencies = [ [[package]] name = "bumpalo" -version = "3.11.1" +version = "3.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "572f695136211188308f16ad2ca5c851a712c464060ae6974944458eb83880ba" +checksum = "a3e2c3daef883ecc1b5d58c15adae93470a91d425f3532ba1695849656af3fc1" [[package]] name = "bytes" @@ -293,9 +296,12 @@ checksum = "38fcc2979eff34a4b84e1cf9a1e3da42a7d44b3b690a40cdcb23e3d556cfb2e5" [[package]] name = "cc" -version = "1.0.79" +version = "1.0.80" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f" +checksum = "51f1226cd9da55587234753d1245dd5b132343ea240f26b6a9003d68706141ba" +dependencies = [ + "libc", +] [[package]] name = "cexpr" @@ -314,12 +320,12 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "chrono" -version = "0.4.24" +version = "0.4.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e3c5919066adf22df73762e50cffcde3a758f2a848b113b586d1f86728b673b" +checksum = "ec837a71355b28f6556dbd569b37b3f363091c0bd4b2e735674521b4c5fd9bc5" dependencies = [ + "android-tzdata", "iana-time-zone", - "num-integer", "num-traits", "winapi", ] @@ -359,9 +365,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.3.0" +version = "4.3.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93aae7a4192245f70fe75dd9157fc7b4a5bf53e88d30bd4396f7d8f9284d5acc" +checksum = "5fd304a20bff958a57f04c4e96a2e7594cc4490a0e809cbd48bb6437edaa452d" dependencies = [ "clap_builder", "clap_derive", @@ -370,27 +376,26 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.3.0" +version = "4.3.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f423e341edefb78c9caba2d9c7f7687d0e72e89df3ce3394554754393ac3990" +checksum = "01c6a3f08f1fe5662a35cfe393aec09c4df95f60ee93b7556505260f75eee9e1" dependencies = [ "anstream", "anstyle", - "bitflags", "clap_lex", "strsim", ] [[package]] name = "clap_derive" -version = "4.3.0" +version = "4.3.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "191d9573962933b4027f932c600cd252ce27a8ad5979418fe78e43c07996f27b" +checksum = "54a9bb5758fc5dfe728d1019941681eccaf0cf8a4189b692a0ee2f2ecf90a050" dependencies = [ "heck", "proc-macro2", "quote", - "syn 2.0.18", + "syn 2.0.28", ] [[package]] @@ -399,16 +404,6 @@ version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2da6da31387c7e4ef160ffab6d5e7f00c42626fe39aea70a7b0f1773f7dd6c1b" -[[package]] -name = "codespan-reporting" -version = "0.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3538270d33cc669650c4b093848450d380def10c331d38c768e34cac80576e6e" -dependencies = [ - "termcolor", - "unicode-width", -] - [[package]] name = "colorchoice" version = "1.0.0" @@ -439,9 +434,9 @@ checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa" [[package]] name = "cpufeatures" -version = "0.2.5" +version = "0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28d997bd5e24a5928dd43e46dc529867e207907fe0b239c3477d924f7f2ca320" +checksum = "a17b76ff3a4162b0b27f354a0c87015ddad39d35f9c0c36607a3bdd175dde1f1" dependencies = [ "libc", ] @@ -456,58 +451,14 @@ dependencies = [ "typenum", ] -[[package]] -name = "cxx" -version = "1.0.86" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51d1075c37807dcf850c379432f0df05ba52cc30f279c5cfc43cc221ce7f8579" -dependencies = [ - "cc", - "cxxbridge-flags", - "cxxbridge-macro", - "link-cplusplus", -] - -[[package]] -name = "cxx-build" -version = "1.0.86" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5044281f61b27bc598f2f6647d480aed48d2bf52d6eb0b627d84c0361b17aa70" -dependencies = [ - "cc", - "codespan-reporting", - "once_cell", - "proc-macro2", - "quote", - "scratch", - "syn 1.0.109", -] - -[[package]] -name = "cxxbridge-flags" -version = "1.0.86" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61b50bc93ba22c27b0d31128d2d130a0a6b3d267ae27ef7e4fae2167dfe8781c" - -[[package]] -name = "cxxbridge-macro" -version = "1.0.86" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39e61fda7e62115119469c7b3591fd913ecca96fb766cfd3f2e2502ab7bc87a5" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - [[package]] name = "dashmap" -version = "5.4.0" +version = "5.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "907076dfda823b0b36d2a1bb5f90c96660a5bbcd7729e10727f07858f22c4edc" +checksum = "6943ae99c34386c84a470c499d3414f66502a41340aa895406e0d2e4a207b91d" dependencies = [ "cfg-if", - "hashbrown", + "hashbrown 0.14.0", "lock_api", "once_cell", "parking_lot_core", @@ -515,9 +466,9 @@ dependencies = [ [[package]] name = "data-encoding" -version = "2.3.3" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23d8666cb01533c39dde32bcbab8e227b4ed6679b2c925eba05feabea39508fb" +checksum = "c2e66c9d817f1720209181c316d28635c050fa304f9c79e47a520882661b7308" [[package]] name = "derive_more" @@ -534,15 +485,15 @@ dependencies = [ [[package]] name = "deunicode" -version = "0.4.3" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "850878694b7933ca4c9569d30a34b55031b9b139ee1fc7b94a527c4ef960d690" +checksum = "d95203a6a50906215a502507c0f879a0ce7ff205a6111e2db2a5ef8e4bb92e43" [[package]] name = "digest" -version = "0.10.6" +version = "0.10.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8168378f4e5023e7218c89c891c0fd8ecdb5e5e4f18cb78f38cf245dd021e76f" +checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" dependencies = [ "block-buffer", "crypto-common", @@ -550,15 +501,15 @@ dependencies = [ [[package]] name = "either" -version = "1.8.1" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91" +checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07" [[package]] name = "encoding_rs" -version = "0.8.31" +version = "0.8.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9852635589dc9f9ea1b6fe9f05b50ef208c85c834a562f0c6abb1c475736ec2b" +checksum = "071a31f4ee85403370b58aca746f01041ede6f0da2730960ad001edc2b71b394" dependencies = [ "cfg-if", ] @@ -575,15 +526,21 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "equivalent" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" + [[package]] name = "errno" -version = "0.3.1" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bcfec3a70f97c962c307b2d2c56e358cf1d00b558d74262b5f929ee8cc7e73a" +checksum = "6b30f669a7961ef1631673d2766cc92f52d64f7ef354d4fe0ddfd30ed52f0f4f" dependencies = [ "errno-dragonfly", "libc", - "windows-sys 0.48.0", + "windows-sys", ] [[package]] @@ -598,9 +555,9 @@ dependencies = [ [[package]] name = "fastcgi-client" -version = "0.8.0" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55a27f39a5870033a855957f11281192a078b70bd4c403c887eac619b50473ea" +checksum = "888aa43e6b500bb98788503b19ec2bafc9de5c4e1e513b84ecfc9d2d34ccd2e8" dependencies = [ "thiserror", "tokio", @@ -609,12 +566,9 @@ dependencies = [ [[package]] name = "fastrand" -version = "1.9.0" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e51093e27b0797c359783294ca4f0a911c270184cb10f85783b118614a1501be" -dependencies = [ - "instant", -] +checksum = "6999dc1837253364c2ebb0704ba97994bd874e8f195d665c50b7548f6ea92764" [[package]] name = "fixedbitset" @@ -645,9 +599,9 @@ checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" [[package]] name = "form_urlencoded" -version = "1.1.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9c384f161156f5260c24a097c56119f9be8c798586aecc13afbcbe7b7e26bf8" +checksum = "a62bc1cf6f830c2ec14a513a9fb124d0a213a629668a4186f329db21fe045652" dependencies = [ "percent-encoding", ] @@ -681,7 +635,7 @@ checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" dependencies = [ "proc-macro2", "quote", - "syn 2.0.18", + "syn 2.0.28", ] [[package]] @@ -715,9 +669,9 @@ dependencies = [ [[package]] name = "generic-array" -version = "0.14.6" +version = "0.14.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bff49e947297f3312447abdca79f45f4738097cc82b06e72054d2223f601f1b9" +checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" dependencies = [ "typenum", "version_check", @@ -725,9 +679,9 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.9" +version = "0.2.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c85e1d9ab2eadba7e5040d4e09cbd6d072b76a557ad64e797c2cb9d4da21d7e4" +checksum = "be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427" dependencies = [ "cfg-if", "libc", @@ -736,9 +690,9 @@ dependencies = [ [[package]] name = "gimli" -version = "0.27.2" +version = "0.27.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad0a93d233ebf96623465aad4046a8d3aa4da22d4f4beba5388838c8a434bbb4" +checksum = "b6c80984affa11d98d1b88b66ac8853f143217b399d3c74116778ff8fdb4ed2e" [[package]] name = "glob" @@ -748,11 +702,11 @@ checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" [[package]] name = "globset" -version = "0.4.10" +version = "0.4.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "029d74589adefde59de1a0c4f4732695c32805624aec7b68d91503d4dba79afc" +checksum = "aca8bbd8e0707c1887a8bbb7e6b40e228f251ff5d62c8220a4a7a53c73aff006" dependencies = [ - "aho-corasick 0.7.20", + "aho-corasick", "bstr", "fnv", "log", @@ -765,16 +719,16 @@ version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "93e3af942408868f6934a7b85134a3230832b9977cf66125df2f9edcfce4ddcc" dependencies = [ - "bitflags", + "bitflags 1.3.2", "ignore", "walkdir", ] [[package]] name = "h2" -version = "0.3.19" +version = "0.3.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d357c7ae988e7d2182f7d7871d0b963962420b0678b0997ce7de72001aeab782" +checksum = "97ec8491ebaf99c8eaa73058b045fe58073cd6be7f596ac993ced0b0a0c01049" dependencies = [ "bytes", "fnv", @@ -782,7 +736,7 @@ dependencies = [ "futures-sink", "futures-util", "http", - "indexmap", + "indexmap 1.9.3", "slab", "tokio", "tokio-util", @@ -796,25 +750,22 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" [[package]] -name = "heck" -version = "0.4.1" +name = "hashbrown" +version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" +checksum = "2c6201b9ff9fd90a5a3bac2e56a830d0caa509576f0e503818ee82c181b3437a" [[package]] -name = "hermit-abi" -version = "0.2.6" +name = "heck" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee512640fe35acbfb4bb779db6f0d80704c2cacfa2e39b601ef3e3f47d1ae4c7" -dependencies = [ - "libc", -] +checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" [[package]] name = "hermit-abi" -version = "0.3.1" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fed44880c466736ef9a5c5b5facefb5ed0785676d0c02d612db14e54f0d84286" +checksum = "443144c8cdadd93ebf52ddb4056d257f5b52c04d3c804e657d19eb73fc33668b" [[package]] name = "hostname" @@ -872,9 +823,9 @@ dependencies = [ [[package]] name = "hyper" -version = "0.14.26" +version = "0.14.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab302d72a6f11a3b910431ff93aae7e773078c769f0a3ef15fb9ec692ed147d4" +checksum = "ffb1cfd654a8219eaef89881fdb3bb3b1cdc5fa75ded05d6933b2b382e395468" dependencies = [ "bytes", "futures-channel", @@ -887,7 +838,7 @@ dependencies = [ "httpdate", "itoa", "pin-project-lite", - "socket2", + "socket2 0.4.9", "tokio", "tower-service", "tracing", @@ -921,26 +872,25 @@ dependencies = [ [[package]] name = "iana-time-zone" -version = "0.1.53" +version = "0.1.57" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64c122667b287044802d6ce17ee2ddf13207ed924c712de9a66a5814d5b64765" +checksum = "2fad5b825842d2b38bd206f3e81d6957625fd7f0a361e345c30e01a0ae2dd613" dependencies = [ "android_system_properties", "core-foundation-sys", "iana-time-zone-haiku", "js-sys", "wasm-bindgen", - "winapi", + "windows", ] [[package]] name = "iana-time-zone-haiku" -version = "0.1.1" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0703ae284fc167426161c2e3f1da3ea71d94b21bedbcc9494e92b28e334e3dca" +checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f" dependencies = [ - "cxx", - "cxx-build", + "cc", ] [[package]] @@ -956,9 +906,9 @@ dependencies = [ [[package]] name = "idna" -version = "0.3.0" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e14ddfc70884202db2244c223200c204c2bda1bc6e0998d11b5e024d657209e6" +checksum = "7d20d6b07bfbc108882d88ed8e37d39636dcc260e15e30c45e6ba089610b917c" dependencies = [ "unicode-bidi", "unicode-normalization", @@ -966,9 +916,9 @@ dependencies = [ [[package]] name = "ignore" -version = "0.4.19" +version = "0.4.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a05705bc64e0b66a806c3740bd6578ea66051b157ec42dc219c785cbf185aef3" +checksum = "dbe7873dab538a9a44ad79ede1faf5f30d49f9a5c883ddbab48bce81b64b7492" dependencies = [ "globset", "lazy_static", @@ -988,57 +938,46 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" dependencies = [ "autocfg", - "hashbrown", -] - -[[package]] -name = "instant" -version = "0.1.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" -dependencies = [ - "cfg-if", + "hashbrown 0.12.3", ] [[package]] -name = "io-lifetimes" -version = "1.0.10" +name = "indexmap" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c66c74d2ae7e79a5a8f7ac924adbe38ee42a859c6539ad869eb51f0b52dc220" +checksum = "d5477fe2230a79769d8dc68e0eabf5437907c0457a5614a9e8dddb67f65eb65d" dependencies = [ - "hermit-abi 0.3.1", - "libc", - "windows-sys 0.48.0", + "equivalent", + "hashbrown 0.14.0", ] [[package]] name = "ipconfig" -version = "0.3.1" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd302af1b90f2463a98fa5ad469fc212c8e3175a41c3068601bfa2727591c5be" +checksum = "b58db92f96b720de98181bbbe63c831e87005ab460c1bf306eb2622b4707997f" dependencies = [ - "socket2", + "socket2 0.5.3", "widestring", - "winapi", - "winreg", + "windows-sys", + "winreg 0.50.0", ] [[package]] name = "ipnet" -version = "2.7.1" +version = "2.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30e22bd8629359895450b59ea7a776c850561b96a3b1d31321c1949d9e6c9146" +checksum = "28b29a3cd74f0f4598934efe3aeba42bae0eb4680554128851ebbecb02af14e6" [[package]] name = "is-terminal" -version = "0.4.7" +version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "adcf93614601c8129ddf72e2d5633df827ba6551541c6d8c59520a371475be1f" +checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b" dependencies = [ - "hermit-abi 0.3.1", - "io-lifetimes", + "hermit-abi", "rustix", - "windows-sys 0.48.0", + "windows-sys", ] [[package]] @@ -1052,15 +991,15 @@ dependencies = [ [[package]] name = "itoa" -version = "1.0.6" +version = "1.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "453ad9f582a441959e5f0d088b02ce04cfe8d51a8eaf077f12ac6d3e94164ca6" +checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38" [[package]] name = "js-sys" -version = "0.3.62" +version = "0.3.64" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68c16e1bfd491478ab155fd8b4896b86f9ede344949b641e61501e07c2b8b4d5" +checksum = "c5f195fe497f702db0f318b07fdd68edb16955aed830df8363d837542f8f935a" dependencies = [ "wasm-bindgen", ] @@ -1079,9 +1018,9 @@ checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" [[package]] name = "libc" -version = "0.2.144" +version = "0.2.147" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b00cc1c228a6782d0f076e7b232802e0c5689d41bb5df366f2a6b6621cfdfe1" +checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3" [[package]] name = "libloading" @@ -1095,17 +1034,20 @@ dependencies = [ [[package]] name = "libm" -version = "0.2.6" +version = "0.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "348108ab3fba42ec82ff6e9564fc4ca0247bdccdc68dd8af9764bbc79c3c8ffb" +checksum = "f7012b1bbb0719e1097c47611d3898568c546d597c2e74d66f6087edd5233ff4" [[package]] -name = "link-cplusplus" -version = "1.0.8" +name = "libz-sys" +version = "1.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ecd207c9c713c34f95a097a5b029ac2ce6010530c7b49d7fea24d977dede04f5" +checksum = "d97137b25e321a73eef1418d1d5d2eda4d77e12813f8e6dead84bc52c5870a7b" dependencies = [ "cc", + "libc", + "pkg-config", + "vcpkg", ] [[package]] @@ -1116,15 +1058,15 @@ checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f" [[package]] name = "linux-raw-sys" -version = "0.3.8" +version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" +checksum = "57bcfdad1b858c2db7c38303a6d2ad4dfaf5eb53dfeb0910128b2c26d6158503" [[package]] name = "lock_api" -version = "0.4.9" +version = "0.4.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "435011366fe56583b16cf956f9df0095b405b82d76425bc8981c0e22e60ec4df" +checksum = "c1cc9717a20b1bb222f333e6a92fd32f7d8a18ddc5a3191a11af45dcbf4dcd16" dependencies = [ "autocfg", "scopeguard", @@ -1132,12 +1074,9 @@ dependencies = [ [[package]] name = "log" -version = "0.4.17" +version = "0.4.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e" -dependencies = [ - "cfg-if", -] +checksum = "b06a4cde4c0f271a446782e3eff8de789548ce57dbc8eca9292c27f4a42004b4" [[package]] name = "lru-cache" @@ -1156,15 +1095,15 @@ checksum = "ffbee8634e0d45d258acb448e7eaab3fce7a0a467395d4d9f228e3c1f01fb2e4" [[package]] name = "matches" -version = "0.1.9" +version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3e378b66a060d48947b590737b30a1be76706c8dd7b8ba0f2fe3989c68a853f" +checksum = "2532096657941c2fea9c289d370a250971c689d4f143798ff67113ec042024a5" [[package]] name = "matchit" -version = "0.7.0" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b87248edafb776e59e6ee64a79086f65890d3510f2c656c000bf2a7e8a0aea40" +checksum = "67827e6ea8ee8a7c4a72227ef4fc08957040acffdb5f122733b24fa12daff41b" [[package]] name = "memchr" @@ -1186,23 +1125,22 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" [[package]] name = "miniz_oxide" -version = "0.6.2" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b275950c28b37e794e8c55d88aeb5e139d0ce23fdbbeda68f8d7174abdf9e8fa" +checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7" dependencies = [ "adler", ] [[package]] name = "mio" -version = "0.8.6" +version = "0.8.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b9d9a46eff5b4ff64b45a9e316a6d1e0bc719ef429cbec4dc630684212bfdf9" +checksum = "927a765cd3fc26206e66b296465fa9d3e5ab003e651c1b3c060e7956d96b19d2" dependencies = [ "libc", - "log", "wasi", - "windows-sys 0.45.0", + "windows-sys", ] [[package]] @@ -1249,49 +1187,39 @@ dependencies = [ "winapi", ] -[[package]] -name = "num-integer" -version = "0.1.45" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9" -dependencies = [ - "autocfg", - "num-traits", -] - [[package]] name = "num-traits" -version = "0.2.15" +version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd" +checksum = "f30b0abd723be7e2ffca1272140fac1a2f084c77ec3e123c192b66af1ee9e6c2" dependencies = [ "autocfg", ] [[package]] name = "num_cpus" -version = "1.15.0" +version = "1.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fac9e2da13b5eb447a6ce3d392f23a29d8694bff781bf03a16cd9ac8697593b" +checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" dependencies = [ - "hermit-abi 0.2.6", + "hermit-abi", "libc", ] [[package]] name = "object" -version = "0.30.3" +version = "0.31.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea86265d3d3dcb6a27fc51bd29a4bf387fae9d2986b823079d4986af253eb439" +checksum = "8bda667d9f2b5051b8833f59f3bf748b28ef54f850f4fcb389a252aa383866d1" dependencies = [ "memchr", ] [[package]] name = "once_cell" -version = "1.17.1" +version = "1.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7e5500299e16ebb147ae15a00a942af264cf3688f47923b8fc2cd5858f23ad3" +checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" [[package]] name = "openssl" @@ -1299,7 +1227,7 @@ version = "0.10.55" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "345df152bc43501c5eb9e4654ff05f794effb78d4efe3d53abc158baddc0703d" dependencies = [ - "bitflags", + "bitflags 1.3.2", "cfg-if", "foreign-types", "libc", @@ -1310,13 +1238,13 @@ dependencies = [ [[package]] name = "openssl-macros" -version = "0.1.0" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b501e44f11665960c7e7fcf062c7d96a14ade4aa98116c004b2e37b5be7d736c" +checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.28", ] [[package]] @@ -1355,15 +1283,15 @@ dependencies = [ [[package]] name = "parking_lot_core" -version = "0.9.7" +version = "0.9.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9069cbb9f99e3a5083476ccb29ceb1de18b9118cafa53e90c9551235de2b9521" +checksum = "93f00c865fe7cabf650081affecd3871070f26767e7b2070a3ffae14c654b447" dependencies = [ "cfg-if", "libc", - "redox_syscall 0.2.16", + "redox_syscall", "smallvec", - "windows-sys 0.45.0", + "windows-targets", ] [[package]] @@ -1383,15 +1311,15 @@ checksum = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099" [[package]] name = "percent-encoding" -version = "2.2.0" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "478c572c3d73181ff3c2539045f6eb99e5491218eae919370993b890cdbdd98e" +checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94" [[package]] name = "pest" -version = "2.5.6" +version = "2.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8cbd939b234e95d72bc393d51788aec68aeeb5d51e748ca08ff3aad58cb722f7" +checksum = "1acb4a4365a13f749a93f1a094a7805e5cfa0955373a9de860d962eaa3a5fe5a" dependencies = [ "thiserror", "ucd-trie", @@ -1399,9 +1327,9 @@ dependencies = [ [[package]] name = "pest_derive" -version = "2.5.6" +version = "2.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a81186863f3d0a27340815be8f2078dd8050b14cd71913db9fbda795e5f707d7" +checksum = "666d00490d4ac815001da55838c500eafb0320019bbaa44444137c48b443a853" dependencies = [ "pest", "pest_generator", @@ -1409,22 +1337,22 @@ dependencies = [ [[package]] name = "pest_generator" -version = "2.5.6" +version = "2.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75a1ef20bf3193c15ac345acb32e26b3dc3223aff4d77ae4fc5359567683796b" +checksum = "68ca01446f50dbda87c1786af8770d535423fa8a53aec03b8f4e3d7eb10e0929" dependencies = [ "pest", "pest_meta", "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.28", ] [[package]] name = "pest_meta" -version = "2.5.6" +version = "2.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e3b284b1f13a20dc5ebc90aff59a51b8d7137c221131b52a7260c08cbc1cc80" +checksum = "56af0a30af74d0445c0bf6d9d051c979b516a1a5af790d251daee76005420a48" dependencies = [ "once_cell", "pest", @@ -1438,7 +1366,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4dd7d28ee937e54fe3080c91faa1c3a46c06de6252988a7f4592ba2310ef22a4" dependencies = [ "fixedbitset", - "indexmap", + "indexmap 1.9.3", ] [[package]] @@ -1487,7 +1415,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d1cce79265fa70f2a6f5f11cf4f694e962f437575dee2001549c19b9489fb630" dependencies = [ "derive_more", - "indexmap", + "indexmap 1.9.3", "once_cell", "phper-alloc", "phper-build", @@ -1538,29 +1466,29 @@ dependencies = [ [[package]] name = "pin-project" -version = "1.1.0" +version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c95a7476719eab1e366eaf73d0260af3021184f18177925b07f54b30089ceead" +checksum = "030ad2bc4db10a8944cb0d837f158bdfec4d4a4873ab701a95046770d11f8842" dependencies = [ "pin-project-internal", ] [[package]] name = "pin-project-internal" -version = "1.1.0" +version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39407670928234ebc5e6e580247dd567ad73a3578460c5990f9503df207e8f07" +checksum = "ec2e072ecce94ec471b13398d5402c188e76ac03cf74dd1a975161b23a3f6d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.18", + "syn 2.0.28", ] [[package]] name = "pin-project-lite" -version = "0.2.9" +version = "0.2.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0a7ae3ac2f1173085d398531c705756c94a4c56843785df85a60c1a0afac116" +checksum = "4c40d25201921e5ff0c862a505c6557ea88568a4e3ace775ab55e93f2f4f9d57" [[package]] name = "pin-utils" @@ -1570,9 +1498,9 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" [[package]] name = "pkg-config" -version = "0.3.26" +version = "0.3.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ac9a59f73473f1b8d852421e59e64809f025994837ef743615c6d0c5b305160" +checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964" [[package]] name = "portable-atomic" @@ -1580,14 +1508,14 @@ version = "0.3.20" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e30165d31df606f5726b090ec7592c308a0eaf61721ff64c9a3018e344a8753e" dependencies = [ - "portable-atomic 1.3.2", + "portable-atomic 1.4.2", ] [[package]] name = "portable-atomic" -version = "1.3.2" +version = "1.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc59d1bcc64fc5d021d67521f818db868368028108d37f0e98d74e33f68297b5" +checksum = "f32154ba0af3a075eefa1eda8bb414ee928f62303a54ea85b8d6638ff1a6ee9e" [[package]] name = "ppv-lite86" @@ -1607,9 +1535,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.59" +version = "1.0.66" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6aeca18b86b413c660b781aa319e4e2648a3e6f9eadc9b47e9038e6fe9f3451b" +checksum = "18fb31db3f9bddb2ea821cde30a9f70117e3f119938b5ee630b7403aa6e2ead9" dependencies = [ "unicode-ident", ] @@ -1676,9 +1604,9 @@ checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0" [[package]] name = "quote" -version = "1.0.28" +version = "1.0.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b9ab9c7eadfd8df19006f1cf1a4aed13540ed5cbc047010ece5826e10825488" +checksum = "50f3b39ccfb720540debaa0164757101c08ecb8d326b15358ce76a62c7e85965" dependencies = [ "proc-macro2", ] @@ -1715,38 +1643,41 @@ dependencies = [ [[package]] name = "redox_syscall" -version = "0.2.16" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" +checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" dependencies = [ - "bitflags", + "bitflags 1.3.2", ] [[package]] -name = "redox_syscall" -version = "0.3.5" +name = "regex" +version = "1.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" +checksum = "b2eae68fc220f7cf2532e4494aded17545fce192d59cd996e0fe7887f4ceb575" dependencies = [ - "bitflags", + "aho-corasick", + "memchr", + "regex-automata", + "regex-syntax", ] [[package]] -name = "regex" -version = "1.8.1" +name = "regex-automata" +version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af83e617f331cc6ae2da5443c602dfa5af81e517212d9d611a5b3ba1777b5370" +checksum = "b7b6d6190b7594385f61bd3911cd1be99dfddcfc365a4160cc2ab5bff4aed294" dependencies = [ - "aho-corasick 1.0.1", + "aho-corasick", "memchr", "regex-syntax", ] [[package]] name = "regex-syntax" -version = "0.7.1" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a5996294f19bd3aae0453a862ad728f60e6600695733dd5df01da90c54363a3c" +checksum = "e5ea92a5b6195c6ef2a0295ea818b312502c6fc94dde986c5553242e18fd4ce2" [[package]] name = "reqwest" @@ -1754,7 +1685,7 @@ version = "0.11.18" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cde824a14b7c14f85caff81225f411faacc04a2013f41670f41443742b1c1c55" dependencies = [ - "base64 0.21.0", + "base64 0.21.2", "bytes", "encoding_rs", "futures-core", @@ -1785,7 +1716,7 @@ dependencies = [ "wasm-bindgen-futures", "wasm-streams", "web-sys", - "winreg", + "winreg 0.10.1", ] [[package]] @@ -1836,16 +1767,15 @@ dependencies = [ [[package]] name = "rustix" -version = "0.37.19" +version = "0.38.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "acf8729d8542766f1b2cf77eb034d52f40d375bb8b615d0b147089946e16613d" +checksum = "0a962918ea88d644592894bc6dc55acc6c0956488adcebbfb6e273506b7fd6e5" dependencies = [ - "bitflags", + "bitflags 2.3.3", "errno", - "io-lifetimes", "libc", "linux-raw-sys", - "windows-sys 0.48.0", + "windows-sys", ] [[package]] @@ -1862,24 +1792,24 @@ dependencies = [ [[package]] name = "rustls-pemfile" -version = "1.0.2" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d194b56d58803a43635bdc398cd17e383d6f71f9182b9a192c127ca42494a59b" +checksum = "2d3987094b1d07b653b7dfdc3f70ce9a1da9c51ac18c1b06b662e4f9a0e9f4b2" dependencies = [ - "base64 0.21.0", + "base64 0.21.2", ] [[package]] name = "rustversion" -version = "1.0.12" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f3208ce4d8448b3f3e7d168a73f5e0c43a61e32930de3bceeccedb388b6bf06" +checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4" [[package]] name = "ryu" -version = "1.0.13" +version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f91339c0467de62360649f8d3e185ca8de4224ff281f66000de5eb2a77a79041" +checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741" [[package]] name = "same-file" @@ -1892,24 +1822,18 @@ dependencies = [ [[package]] name = "schannel" -version = "0.1.21" +version = "0.1.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "713cfb06c7059f3588fb8044c0fad1d09e3c01d225e25b9220dbfdcf16dbb1b3" +checksum = "0c3733bf4cf7ea0880754e19cb5a462007c4a8c1914bff372ccc95b464f1df88" dependencies = [ - "windows-sys 0.42.0", + "windows-sys", ] [[package]] name = "scopeguard" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" - -[[package]] -name = "scratch" -version = "1.0.3" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ddccb15bcce173023b3fedd9436f882a0739b8dfb45e4f6b6002bee5929f61b2" +checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" [[package]] name = "scripts" @@ -1936,11 +1860,11 @@ dependencies = [ [[package]] name = "security-framework" -version = "2.7.0" +version = "2.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2bc1bb97804af6631813c55739f771071e0f2ed33ee20b68c86ec505d906356c" +checksum = "05b64fb303737d99b81884b2c63433e9ae28abebe5eb5045dcdd175dc2ecf4de" dependencies = [ - "bitflags", + "bitflags 1.3.2", "core-foundation", "core-foundation-sys", "libc", @@ -1949,9 +1873,9 @@ dependencies = [ [[package]] name = "security-framework-sys" -version = "2.8.0" +version = "2.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31c9bb296072e961fcbd8853511dd39c2d8be2deb1e17c6860b1d30732b323b4" +checksum = "e932934257d3b408ed8f30db49d85ea163bfe74961f017f405b025af298f0c7a" dependencies = [ "core-foundation-sys", "libc", @@ -1959,37 +1883,37 @@ dependencies = [ [[package]] name = "semver" -version = "1.0.17" +version = "1.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bebd363326d05ec3e2f532ab7660680f3b02130d780c299bca73469d521bc0ed" +checksum = "b0293b4b29daaf487284529cc2f5675b8e57c61f70167ba415a463651fd6a918" [[package]] name = "serde" -version = "1.0.163" +version = "1.0.180" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2113ab51b87a539ae008b5c6c02dc020ffa39afd2d83cffcb3f4eb2722cebec2" +checksum = "0ea67f183f058fe88a4e3ec6e2788e003840893b91bac4559cabedd00863b3ed" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.163" +version = "1.0.180" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c805777e3930c8883389c602315a24224bcc738b63905ef87cd1420353ea93e" +checksum = "24e744d7782b686ab3b73267ef05697159cc0e5abbed3f47f9933165e5219036" dependencies = [ "proc-macro2", "quote", - "syn 2.0.18", + "syn 2.0.28", ] [[package]] name = "serde_json" -version = "1.0.96" +version = "1.0.104" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "057d394a50403bcac12672b2b18fb387ab6d289d957dab67dd201875391e52f1" +checksum = "076066c5f1078eac5b722a31827a8832fe108bed65dfa75e233c89f8206e976c" dependencies = [ - "indexmap", + "indexmap 2.0.0", "itoa", "ryu", "serde", @@ -1997,10 +1921,11 @@ dependencies = [ [[package]] name = "serde_path_to_error" -version = "0.1.11" +version = "0.1.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7f05c1d5476066defcdfacce1f52fc3cae3af1d3089727100c02ae92e5abbe0" +checksum = "4beec8bce849d58d06238cb50db2e1c417cfeafa4c63f692b15c82b7c80f8335" dependencies = [ + "itoa", "serde", ] @@ -2018,9 +1943,9 @@ dependencies = [ [[package]] name = "sha2" -version = "0.10.6" +version = "0.10.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82e6b795fe2e3b1e845bafcb27aa35405c4d47cdfc92af5fc8d3002f76cebdc0" +checksum = "479fb9d862239e610720565ca91403019f2f00410f1864c5aa7479b950a76ed8" dependencies = [ "cfg-if", "cpufeatures", @@ -2059,9 +1984,9 @@ checksum = "7bd3e3206899af3f8b12af284fafc038cc1dc2b41d1b89dd17297221c5d225de" [[package]] name = "skywalking" -version = "0.7.0" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52aa801db00a7a2f2ae6e3b5635fc148da7eea7727c020e454424688b0a507c1" +checksum = "e10d03f205ab1fb2cf9848779a5a954ba174503161908b81bcc812f6264e7728" dependencies = [ "base64 0.13.1", "bytes", @@ -2069,6 +1994,7 @@ dependencies = [ "futures-core", "futures-util", "hostname", + "libz-sys", "once_cell", "parking_lot", "portable-atomic 0.3.20", @@ -2134,9 +2060,9 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.10.0" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0" +checksum = "62bb4feee49fdd9f707ef802e22365a35de4b7b299de4763d44bfea899442ff9" [[package]] name = "socket2" @@ -2148,6 +2074,16 @@ dependencies = [ "winapi", ] +[[package]] +name = "socket2" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2538b18701741680e0322a2302176d3253a35388e2e62f172f64f4f16605f877" +dependencies = [ + "libc", + "windows-sys", +] + [[package]] name = "spin" version = "0.5.2" @@ -2173,9 +2109,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.18" +version = "2.0.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32d41677bcbe24c20c52e7c70b0d8db04134c5d1066bf98662e2871ad200ea3e" +checksum = "04361975b3f5e348b2189d8dc55bc942f278b2d482a6a0365de5bdd62d351567" dependencies = [ "proc-macro2", "quote", @@ -2204,22 +2140,22 @@ dependencies = [ [[package]] name = "tempfile" -version = "3.5.0" +version = "3.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9fbec84f381d5795b08656e4912bec604d162bff9291d6189a78f4c8ab87998" +checksum = "5486094ee78b2e5038a6382ed7645bc084dc2ec433426ca4c3cb61e2007b8998" dependencies = [ "cfg-if", "fastrand", - "redox_syscall 0.3.5", + "redox_syscall", "rustix", - "windows-sys 0.45.0", + "windows-sys", ] [[package]] name = "tera" -version = "1.18.1" +version = "1.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95a665751302f22a03c56721e23094e4dc22b04a80f381e6737a07bf7a7c70c0" +checksum = "a5ab29bb4f3e256ae6ad5c3e2775aa1f8829f2c0c101fc407bfd3a6df15c60c5" dependencies = [ "chrono", "chrono-tz", @@ -2238,33 +2174,24 @@ dependencies = [ "unic-segment", ] -[[package]] -name = "termcolor" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be55cf8942feac5c765c2c993422806843c9a9a45d4d5c407ad6dd2ea95eb9b6" -dependencies = [ - "winapi-util", -] - [[package]] name = "thiserror" -version = "1.0.40" +version = "1.0.44" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "978c9a314bd8dc99be594bc3c175faaa9794be04a5a5e153caba6915336cebac" +checksum = "611040a08a0439f8248d1990b111c95baa9c704c805fa1f62104b39655fd7f90" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.40" +version = "1.0.44" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f" +checksum = "090198534930841fab3a5d1bb637cde49e339654e606195f8d9c76eeb081dc96" dependencies = [ "proc-macro2", "quote", - "syn 2.0.18", + "syn 2.0.28", ] [[package]] @@ -2278,9 +2205,9 @@ dependencies = [ [[package]] name = "time" -version = "0.3.21" +version = "0.3.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f3403384eaacbca9923fa06940178ac13e4edb725486d70e8e15881d0c836cc" +checksum = "59e399c068f43a5d116fedaf73b203fa4f9c519f17e2b34f63221d3792f81446" dependencies = [ "serde", "time-core", @@ -2303,17 +2230,18 @@ dependencies = [ [[package]] name = "tinyvec_macros" -version = "0.1.0" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c" +checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.28.1" +version = "1.29.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0aa32867d44e6f2ce3385e89dceb990188b8bb0fb25b0cf576647a6f98ac5105" +checksum = "532826ff75199d5833b9d2c5fe410f29235e25704ee5f0ef599fb51c21f4a4da" dependencies = [ "autocfg", + "backtrace", "bytes", "libc", "mio", @@ -2321,9 +2249,9 @@ dependencies = [ "parking_lot", "pin-project-lite", "signal-hook-registry", - "socket2", + "socket2 0.4.9", "tokio-macros", - "windows-sys 0.48.0", + "windows-sys", ] [[package]] @@ -2344,14 +2272,14 @@ checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.18", + "syn 2.0.28", ] [[package]] name = "tokio-native-tls" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7d995660bd2b7f8c1568414c1126076c13fbb725c40112dc0120b78eb9b717b" +checksum = "bbae76ab933c85776efabc971569dd6119c580d8f5d448769dec1764bf796ef2" dependencies = [ "native-tls", "tokio", @@ -2448,7 +2376,7 @@ checksum = "b8fa9be0de6cf49e536ce1851f987bd21a43b771b09473c3549a6c853db37c1c" dependencies = [ "futures-core", "futures-util", - "indexmap", + "indexmap 1.9.3", "pin-project", "pin-project-lite", "rand", @@ -2487,13 +2415,13 @@ dependencies = [ [[package]] name = "tracing-attributes" -version = "0.1.24" +version = "0.1.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f57e3ca2a01450b1a921183a9c9cbfda207fd822cef4ccb00a65402cbba7a74" +checksum = "5f4f31f56159e98206da9efd823404b79b6ef3143b4a7ab76e67b1751b25a4ab" dependencies = [ "proc-macro2", "quote", - "syn 2.0.18", + "syn 2.0.28", ] [[package]] @@ -2600,15 +2528,15 @@ checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba" [[package]] name = "ucd-trie" -version = "0.1.5" +version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e79c4d996edb816c91e4308506774452e55e95c3c9de07b6729e17e15a5ef81" +checksum = "ed646292ffc8188ef8ea4d1e0e0150fb15a5c2e12ad9b8fc191ae7a8a7f3c4b9" [[package]] name = "uncased" -version = "0.9.7" +version = "0.9.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09b01702b0fd0b3fadcf98e098780badda8742d4f4a7676615cad90e8ac73622" +checksum = "9b9bc53168a4be7402ab86c3aad243a84dd7381d09be0eddc81280c1da95ca68" dependencies = [ "version_check", ] @@ -2665,15 +2593,15 @@ dependencies = [ [[package]] name = "unicode-bidi" -version = "0.3.8" +version = "0.3.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "099b7128301d285f79ddd55b9a83d5e6b9e97c92e0ea0daebee7263e932de992" +checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" [[package]] name = "unicode-ident" -version = "1.0.8" +version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5464a87b239f13a63a501f2701565754bae92d243d4bb7eb12f6d57d2269bf4" +checksum = "301abaae475aa91687eb82514b328ab47a211a533026cb25fc3e519b86adfc3c" [[package]] name = "unicode-normalization" @@ -2684,12 +2612,6 @@ dependencies = [ "tinyvec", ] -[[package]] -name = "unicode-width" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b" - [[package]] name = "untrusted" version = "0.7.1" @@ -2698,12 +2620,12 @@ checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a" [[package]] name = "url" -version = "2.3.1" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d68c799ae75762b8c3fe375feb6600ef5602c883c5d21eb51c09f22b83c4643" +checksum = "50bff7831e19200a85b17131d085c25d7811bc4e186efdaf54bbd132994a88cb" dependencies = [ "form_urlencoded", - "idna 0.3.0", + "idna 0.4.0", "percent-encoding", ] @@ -2715,9 +2637,9 @@ checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" [[package]] name = "uuid" -version = "1.3.3" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "345444e32442451b267fc254ae85a209c64be56d2890e601a0c37ff0c3c5ecd2" +checksum = "79daa5ed5740825c40b389c5e50312b9c86df53fccd33f281df655642b43869d" dependencies = [ "getrandom", "serde", @@ -2743,22 +2665,20 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" [[package]] name = "walkdir" -version = "2.3.2" +version = "2.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "808cf2735cd4b6866113f648b791c6adc5714537bc222d9347bb203386ffda56" +checksum = "36df944cda56c7d8d8b7496af378e6b16de9284591917d307c9b4d313c44e698" dependencies = [ "same-file", - "winapi", "winapi-util", ] [[package]] name = "want" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ce8a968cb1cd110d136ff8b819a556d6fb6d919363c61534f6860c7eb172ba0" +checksum = "bfa7760aed19e106de2c7c0b581b509f2f25d3dacaf737cb82ac61bc6d760b0e" dependencies = [ - "log", "try-lock", ] @@ -2770,9 +2690,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.85" +version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b6cb788c4e39112fbe1822277ef6fb3c55cd86b95cb3d3c4c1c9597e4ac74b4" +checksum = "7706a72ab36d8cb1f80ffbf0e071533974a60d0a308d01a5d0375bf60499a342" dependencies = [ "cfg-if", "wasm-bindgen-macro", @@ -2780,24 +2700,24 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.85" +version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35e522ed4105a9d626d885b35d62501b30d9666283a5c8be12c14a8bdafe7822" +checksum = "5ef2b6d3c510e9625e5fe6f509ab07d66a760f0885d858736483c32ed7809abd" dependencies = [ "bumpalo", "log", "once_cell", "proc-macro2", "quote", - "syn 2.0.18", + "syn 2.0.28", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-futures" -version = "0.4.35" +version = "0.4.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "083abe15c5d88556b77bdf7aef403625be9e327ad37c62c4e4129af740168163" +checksum = "c02dbc21516f9f1f04f187958890d7e6026df8d16540b7ad9492bc34a67cea03" dependencies = [ "cfg-if", "js-sys", @@ -2807,9 +2727,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.85" +version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "358a79a0cb89d21db8120cbfb91392335913e4890665b1a7981d9e956903b434" +checksum = "dee495e55982a3bd48105a7b947fd2a9b4a8ae3010041b9e0faab3f9cd028f1d" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -2817,22 +2737,22 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.85" +version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4783ce29f09b9d93134d41297aded3a712b7b979e9c6f28c32cb88c973a94869" +checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.18", + "syn 2.0.28", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.85" +version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a901d592cafaa4d711bc324edfaff879ac700b19c3dfd60058d2b445be2691eb" +checksum = "ca6ad05a4870b2bf5fe995117d3728437bd27d7cd5f06f13c17443ef369775a1" [[package]] name = "wasm-streams" @@ -2849,9 +2769,9 @@ dependencies = [ [[package]] name = "web-sys" -version = "0.3.60" +version = "0.3.64" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bcda906d8be16e728fd5adc5b729afad4e444e106ab28cd1c7256e54fa61510f" +checksum = "9b85cbef8c220a6abc02aefd892dfc0fc23afb1c6a426316ec33253a3877249b" dependencies = [ "js-sys", "wasm-bindgen", @@ -2880,9 +2800,9 @@ dependencies = [ [[package]] name = "widestring" -version = "0.5.1" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17882f045410753661207383517a6f62ec3dbeb6a4ed2acce01f0728238d1983" +checksum = "653f141f39ec16bba3c5abe400a0c60da7468261cc2cbf36805022876bc721a8" [[package]] name = "winapi" @@ -2916,27 +2836,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] -name = "windows-sys" -version = "0.42.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7" -dependencies = [ - "windows_aarch64_gnullvm 0.42.2", - "windows_aarch64_msvc 0.42.2", - "windows_i686_gnu 0.42.2", - "windows_i686_msvc 0.42.2", - "windows_x86_64_gnu 0.42.2", - "windows_x86_64_gnullvm 0.42.2", - "windows_x86_64_msvc 0.42.2", -] - -[[package]] -name = "windows-sys" -version = "0.45.0" +name = "windows" +version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0" +checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f" dependencies = [ - "windows-targets 0.42.2", + "windows-targets", ] [[package]] @@ -2945,117 +2850,60 @@ version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" dependencies = [ - "windows-targets 0.48.0", + "windows-targets", ] [[package]] name = "windows-targets" -version = "0.42.2" +version = "0.48.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071" +checksum = "05d4b17490f70499f20b9e791dcf6a299785ce8af4d709018206dc5b4953e95f" dependencies = [ - "windows_aarch64_gnullvm 0.42.2", - "windows_aarch64_msvc 0.42.2", - "windows_i686_gnu 0.42.2", - "windows_i686_msvc 0.42.2", - "windows_x86_64_gnu 0.42.2", - "windows_x86_64_gnullvm 0.42.2", - "windows_x86_64_msvc 0.42.2", + "windows_aarch64_gnullvm", + "windows_aarch64_msvc", + "windows_i686_gnu", + "windows_i686_msvc", + "windows_x86_64_gnu", + "windows_x86_64_gnullvm", + "windows_x86_64_msvc", ] -[[package]] -name = "windows-targets" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b1eb6f0cd7c80c79759c929114ef071b87354ce476d9d94271031c0497adfd5" -dependencies = [ - "windows_aarch64_gnullvm 0.48.0", - "windows_aarch64_msvc 0.48.0", - "windows_i686_gnu 0.48.0", - "windows_i686_msvc 0.48.0", - "windows_x86_64_gnu 0.48.0", - "windows_x86_64_gnullvm 0.48.0", - "windows_x86_64_msvc 0.48.0", -] - -[[package]] -name = "windows_aarch64_gnullvm" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8" - [[package]] name = "windows_aarch64_gnullvm" version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc" -[[package]] -name = "windows_aarch64_msvc" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43" - [[package]] name = "windows_aarch64_msvc" version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3" -[[package]] -name = "windows_i686_gnu" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f" - [[package]] name = "windows_i686_gnu" version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241" -[[package]] -name = "windows_i686_msvc" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" - [[package]] name = "windows_i686_msvc" version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00" -[[package]] -name = "windows_x86_64_gnu" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36" - [[package]] name = "windows_x86_64_gnu" version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1" -[[package]] -name = "windows_x86_64_gnullvm" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3" - [[package]] name = "windows_x86_64_gnullvm" version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953" -[[package]] -name = "windows_x86_64_msvc" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" - [[package]] name = "windows_x86_64_msvc" version = "0.48.0" @@ -3070,3 +2918,13 @@ checksum = "80d0f4e272c85def139476380b12f9ac60926689dd2e01d4923222f40580869d" dependencies = [ "winapi", ] + +[[package]] +name = "winreg" +version = "0.50.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "524e57b2c537c0f9b1e69f1965311ec12182b4122e45035b1508cd24d2adadb1" +dependencies = [ + "cfg-if", + "windows-sys", +] diff --git a/Cargo.toml b/Cargo.toml index 47debd0..0345bd0 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -36,29 +36,29 @@ name = "skywalking_agent" crate-type = ["lib", "cdylib"] [dependencies] -anyhow = { version = "1.0.71", features = ["backtrace"] } +anyhow = { version = "1.0.72", features = ["backtrace"] } bincode = "1.3.3" -dashmap = "5.4.0" +dashmap = "5.5.0" futures-util = "0.3.28" hostname = "0.3.1" -libc = "0.2.144" -once_cell = "1.17.1" +libc = "0.2.147" +once_cell = "1.18.0" phper = "0.12.0" prost = "0.11.9" -serde_json = { version = "1.0.96", features = ["preserve_order"] } -skywalking = { version = "0.7.0", features = ["management"] } +serde_json = { version = "1.0.104", features = ["preserve_order"] } +skywalking = { version = "0.8.0", features = ["management"] } systemstat = "0.2.3" -thiserror = "1.0.40" -tokio = { version = "1.28.1", features = ["full"] } +thiserror = "1.0.44" +tokio = { version = "1.29.1", features = ["full"] } tokio-stream = "0.1.14" tonic = { version = "0.8.3", features = ["tls"] } tracing = { version = "0.1.37", features = ["attributes"] } tracing-subscriber = "0.3.17" -url = "2.3.1" +url = "2.4.0" [dev-dependencies] -axum = "0.6.18" -fastcgi-client = "0.8.0" +axum = "0.6.19" +fastcgi-client = "0.9.0" reqwest = { version = "0.11.18", features = ["trust-dns", "json", "stream"] } [build-dependencies] diff --git a/dist-material/LICENSE b/dist-material/LICENSE index 79cc092..35c499b 100644 --- a/dist-material/LICENSE +++ b/dist-material/LICENSE @@ -190,7 +190,7 @@ licenses. The following components are provided under the (Apache-2.0 OR MIT) AND BSD-3-Clause License. See project link for details. The text of each license is also included in licenses/LICENSE-[project].txt. - https://crates.io/crates/encoding_rs/0.8.31 0.8.31 (Apache-2.0 OR MIT) AND BSD-3-Clause + https://crates.io/crates/encoding_rs/0.8.32 0.8.32 (Apache-2.0 OR MIT) AND BSD-3-Clause ======================================================================== (MIT OR Apache-2.0) AND Unicode-DFS-2016 licenses @@ -198,7 +198,7 @@ The text of each license is also included in licenses/LICENSE-[project].txt. The following components are provided under the (MIT OR Apache-2.0) AND Unicode-DFS-2016 License. See project link for details. The text of each license is also included in licenses/LICENSE-[project].txt. - https://crates.io/crates/unicode-ident/1.0.8 1.0.8 (MIT OR Apache-2.0) AND Unicode-DFS-2016 + https://crates.io/crates/unicode-ident/1.0.11 1.0.11 (MIT OR Apache-2.0) AND Unicode-DFS-2016 ======================================================================== 0BSD OR Apache-2.0 OR MIT licenses @@ -215,15 +215,14 @@ The following components are provided under the Apache-2.0 License. See project The text of each license is the standard Apache 2.0 license. https://crates.io/crates/bytesize/1.2.0 1.2.0 Apache-2.0 https://crates.io/crates/clang-sys/1.6.1 1.6.1 Apache-2.0 - https://crates.io/crates/codespan-reporting/0.11.1 0.11.1 Apache-2.0 - https://crates.io/crates/fastcgi-client/0.8.0 0.8.0 Apache-2.0 + https://crates.io/crates/fastcgi-client/0.9.0 0.9.0 Apache-2.0 https://crates.io/crates/openssl/0.10.55 0.10.55 Apache-2.0 https://crates.io/crates/prost/0.11.9 0.11.9 Apache-2.0 https://crates.io/crates/prost-build/0.11.9 0.11.9 Apache-2.0 https://crates.io/crates/prost-derive/0.11.9 0.11.9 Apache-2.0 https://crates.io/crates/prost-types/0.11.9 0.11.9 Apache-2.0 https://crates.io/crates/scripts/0.0.0 0.0.0 Apache-2.0 - https://crates.io/crates/skywalking/0.7.0 0.7.0 Apache-2.0 + https://crates.io/crates/skywalking/0.8.0 0.8.0 Apache-2.0 https://crates.io/crates/skywalking-php/0.6.0-dev 0.6.0-dev Apache-2.0 https://crates.io/crates/sync_wrapper/0.1.2 0.1.2 Apache-2.0 @@ -233,9 +232,8 @@ Apache-2.0 OR Apache-2.0 WITH LLVM-exception OR MIT licenses The following components are provided under the Apache-2.0 OR Apache-2.0 WITH LLVM-exception OR MIT License. See project link for details. The text of each license is also included in licenses/LICENSE-[project].txt. - https://crates.io/crates/io-lifetimes/1.0.10 1.0.10 Apache-2.0 OR Apache-2.0 WITH LLVM-exception OR MIT - https://crates.io/crates/linux-raw-sys/0.3.8 0.3.8 Apache-2.0 OR Apache-2.0 WITH LLVM-exception OR MIT - https://crates.io/crates/rustix/0.37.19 0.37.19 Apache-2.0 OR Apache-2.0 WITH LLVM-exception OR MIT + https://crates.io/crates/linux-raw-sys/0.4.5 0.4.5 Apache-2.0 OR Apache-2.0 WITH LLVM-exception OR MIT + https://crates.io/crates/rustix/0.38.4 0.38.4 Apache-2.0 OR Apache-2.0 WITH LLVM-exception OR MIT https://crates.io/crates/wasi/0.11.0+wasi-snapshot-preview1 0.11.0+wasi-snapshot-preview1 Apache-2.0 OR Apache-2.0 WITH LLVM-exception OR MIT ======================================================================== @@ -244,7 +242,7 @@ Apache-2.0 OR BSL-1.0 licenses The following components are provided under the Apache-2.0 OR BSL-1.0 License. See project link for details. The text of each license is also included in licenses/LICENSE-[project].txt. - https://crates.io/crates/ryu/1.0.13 1.0.13 Apache-2.0 OR BSL-1.0 + https://crates.io/crates/ryu/1.0.15 1.0.15 Apache-2.0 OR BSL-1.0 ======================================================================== Apache-2.0 OR ISC OR MIT licenses @@ -253,7 +251,7 @@ The following components are provided under the Apache-2.0 OR ISC OR MIT License The text of each license is also included in licenses/LICENSE-[project].txt. https://crates.io/crates/rustls/0.20.8 0.20.8 Apache-2.0 OR ISC OR MIT - https://crates.io/crates/rustls-pemfile/1.0.2 1.0.2 Apache-2.0 OR ISC OR MIT + https://crates.io/crates/rustls-pemfile/1.0.3 1.0.3 Apache-2.0 OR ISC OR MIT https://crates.io/crates/sct/0.7.0 0.7.0 Apache-2.0 OR ISC OR MIT ======================================================================== @@ -262,52 +260,51 @@ Apache-2.0 OR MIT licenses The following components are provided under the Apache-2.0 OR MIT License. See project link for details. The text of each license is also included in licenses/LICENSE-[project].txt. - https://crates.io/crates/addr2line/0.19.0 0.19.0 Apache-2.0 OR MIT + https://crates.io/crates/addr2line/0.20.0 0.20.0 Apache-2.0 OR MIT + https://crates.io/crates/android-tzdata/0.1.1 0.1.1 Apache-2.0 OR MIT https://crates.io/crates/android_system_properties/0.1.5 0.1.5 Apache-2.0 OR MIT https://crates.io/crates/anstream/0.3.2 0.3.2 Apache-2.0 OR MIT - https://crates.io/crates/anstyle/1.0.0 1.0.0 Apache-2.0 OR MIT - https://crates.io/crates/anstyle-parse/0.2.0 0.2.0 Apache-2.0 OR MIT + https://crates.io/crates/anstyle/1.0.1 1.0.1 Apache-2.0 OR MIT + https://crates.io/crates/anstyle-parse/0.2.1 0.2.1 Apache-2.0 OR MIT https://crates.io/crates/anstyle-query/1.0.0 1.0.0 Apache-2.0 OR MIT https://crates.io/crates/anstyle-wincon/1.0.1 1.0.1 Apache-2.0 OR MIT - https://crates.io/crates/anyhow/1.0.71 1.0.71 Apache-2.0 OR MIT - https://crates.io/crates/async-trait/0.1.68 0.1.68 Apache-2.0 OR MIT + https://crates.io/crates/anyhow/1.0.72 1.0.72 Apache-2.0 OR MIT + https://crates.io/crates/async-trait/0.1.72 0.1.72 Apache-2.0 OR MIT https://crates.io/crates/autocfg/1.1.0 1.1.0 Apache-2.0 OR MIT - https://crates.io/crates/backtrace/0.3.67 0.3.67 Apache-2.0 OR MIT + https://crates.io/crates/backtrace/0.3.68 0.3.68 Apache-2.0 OR MIT https://crates.io/crates/base64/0.13.1 0.13.1 Apache-2.0 OR MIT - https://crates.io/crates/base64/0.21.0 0.21.0 Apache-2.0 OR MIT + https://crates.io/crates/base64/0.21.2 0.21.2 Apache-2.0 OR MIT https://crates.io/crates/bitflags/1.3.2 1.3.2 Apache-2.0 OR MIT - https://crates.io/crates/block-buffer/0.10.3 0.10.3 Apache-2.0 OR MIT - https://crates.io/crates/bstr/1.1.0 1.1.0 Apache-2.0 OR MIT - https://crates.io/crates/bumpalo/3.11.1 3.11.1 Apache-2.0 OR MIT - https://crates.io/crates/cc/1.0.79 1.0.79 Apache-2.0 OR MIT + https://crates.io/crates/bitflags/2.3.3 2.3.3 Apache-2.0 OR MIT + https://crates.io/crates/block-buffer/0.10.4 0.10.4 Apache-2.0 OR MIT + https://crates.io/crates/bstr/1.6.0 1.6.0 Apache-2.0 OR MIT + https://crates.io/crates/bumpalo/3.13.0 3.13.0 Apache-2.0 OR MIT + https://crates.io/crates/cc/1.0.80 1.0.80 Apache-2.0 OR MIT https://crates.io/crates/cexpr/0.6.0 0.6.0 Apache-2.0 OR MIT https://crates.io/crates/cfg-if/1.0.0 1.0.0 Apache-2.0 OR MIT - https://crates.io/crates/chrono/0.4.24 0.4.24 Apache-2.0 OR MIT + https://crates.io/crates/chrono/0.4.26 0.4.26 Apache-2.0 OR MIT https://crates.io/crates/chrono-tz/0.6.1 0.6.1 Apache-2.0 OR MIT https://crates.io/crates/chrono-tz-build/0.0.2 0.0.2 Apache-2.0 OR MIT - https://crates.io/crates/clap/4.3.0 4.3.0 Apache-2.0 OR MIT - https://crates.io/crates/clap_builder/4.3.0 4.3.0 Apache-2.0 OR MIT - https://crates.io/crates/clap_derive/4.3.0 4.3.0 Apache-2.0 OR MIT + https://crates.io/crates/clap/4.3.19 4.3.19 Apache-2.0 OR MIT + https://crates.io/crates/clap_builder/4.3.19 4.3.19 Apache-2.0 OR MIT + https://crates.io/crates/clap_derive/4.3.12 4.3.12 Apache-2.0 OR MIT https://crates.io/crates/clap_lex/0.5.0 0.5.0 Apache-2.0 OR MIT https://crates.io/crates/colorchoice/1.0.0 1.0.0 Apache-2.0 OR MIT https://crates.io/crates/core-foundation/0.9.3 0.9.3 Apache-2.0 OR MIT https://crates.io/crates/core-foundation-sys/0.8.4 0.8.4 Apache-2.0 OR MIT - https://crates.io/crates/cpufeatures/0.2.5 0.2.5 Apache-2.0 OR MIT + https://crates.io/crates/cpufeatures/0.2.9 0.2.9 Apache-2.0 OR MIT https://crates.io/crates/crypto-common/0.1.6 0.1.6 Apache-2.0 OR MIT - https://crates.io/crates/cxx/1.0.86 1.0.86 Apache-2.0 OR MIT - https://crates.io/crates/cxx-build/1.0.86 1.0.86 Apache-2.0 OR MIT - https://crates.io/crates/cxxbridge-flags/1.0.86 1.0.86 Apache-2.0 OR MIT - https://crates.io/crates/cxxbridge-macro/1.0.86 1.0.86 Apache-2.0 OR MIT - https://crates.io/crates/digest/0.10.6 0.10.6 Apache-2.0 OR MIT - https://crates.io/crates/either/1.8.1 1.8.1 Apache-2.0 OR MIT + https://crates.io/crates/digest/0.10.7 0.10.7 Apache-2.0 OR MIT + https://crates.io/crates/either/1.9.0 1.9.0 Apache-2.0 OR MIT https://crates.io/crates/enum-as-inner/0.5.1 0.5.1 Apache-2.0 OR MIT - https://crates.io/crates/errno/0.3.1 0.3.1 Apache-2.0 OR MIT - https://crates.io/crates/fastrand/1.9.0 1.9.0 Apache-2.0 OR MIT + https://crates.io/crates/equivalent/1.0.1 1.0.1 Apache-2.0 OR MIT + https://crates.io/crates/errno/0.3.2 0.3.2 Apache-2.0 OR MIT + https://crates.io/crates/fastrand/2.0.0 2.0.0 Apache-2.0 OR MIT https://crates.io/crates/fixedbitset/0.4.2 0.4.2 Apache-2.0 OR MIT https://crates.io/crates/fnv/1.0.7 1.0.7 Apache-2.0 OR MIT https://crates.io/crates/foreign-types/0.3.2 0.3.2 Apache-2.0 OR MIT https://crates.io/crates/foreign-types-shared/0.1.1 0.1.1 Apache-2.0 OR MIT - https://crates.io/crates/form_urlencoded/1.1.0 1.1.0 Apache-2.0 OR MIT + https://crates.io/crates/form_urlencoded/1.2.0 1.2.0 Apache-2.0 OR MIT https://crates.io/crates/futures-channel/0.3.28 0.3.28 Apache-2.0 OR MIT https://crates.io/crates/futures-core/0.3.28 0.3.28 Apache-2.0 OR MIT https://crates.io/crates/futures-io/0.3.28 0.3.28 Apache-2.0 OR MIT @@ -315,158 +312,149 @@ The text of each license is also included in licenses/LICENSE-[project].txt. https://crates.io/crates/futures-sink/0.3.28 0.3.28 Apache-2.0 OR MIT https://crates.io/crates/futures-task/0.3.28 0.3.28 Apache-2.0 OR MIT https://crates.io/crates/futures-util/0.3.28 0.3.28 Apache-2.0 OR MIT - https://crates.io/crates/getrandom/0.2.9 0.2.9 Apache-2.0 OR MIT - https://crates.io/crates/gimli/0.27.2 0.27.2 Apache-2.0 OR MIT + https://crates.io/crates/getrandom/0.2.10 0.2.10 Apache-2.0 OR MIT + https://crates.io/crates/gimli/0.27.3 0.27.3 Apache-2.0 OR MIT https://crates.io/crates/glob/0.3.1 0.3.1 Apache-2.0 OR MIT https://crates.io/crates/hashbrown/0.12.3 0.12.3 Apache-2.0 OR MIT + https://crates.io/crates/hashbrown/0.14.0 0.14.0 Apache-2.0 OR MIT https://crates.io/crates/heck/0.4.1 0.4.1 Apache-2.0 OR MIT - https://crates.io/crates/hermit-abi/0.2.6 0.2.6 Apache-2.0 OR MIT - https://crates.io/crates/hermit-abi/0.3.1 0.3.1 Apache-2.0 OR MIT + https://crates.io/crates/hermit-abi/0.3.2 0.3.2 Apache-2.0 OR MIT https://crates.io/crates/http/0.2.9 0.2.9 Apache-2.0 OR MIT https://crates.io/crates/httparse/1.8.0 1.8.0 Apache-2.0 OR MIT https://crates.io/crates/httpdate/1.0.2 1.0.2 Apache-2.0 OR MIT https://crates.io/crates/humansize/2.1.3 2.1.3 Apache-2.0 OR MIT https://crates.io/crates/hyper-timeout/0.4.1 0.4.1 Apache-2.0 OR MIT https://crates.io/crates/hyper-tls/0.5.0 0.5.0 Apache-2.0 OR MIT - https://crates.io/crates/iana-time-zone/0.1.53 0.1.53 Apache-2.0 OR MIT - https://crates.io/crates/iana-time-zone-haiku/0.1.1 0.1.1 Apache-2.0 OR MIT + https://crates.io/crates/iana-time-zone/0.1.57 0.1.57 Apache-2.0 OR MIT + https://crates.io/crates/iana-time-zone-haiku/0.1.2 0.1.2 Apache-2.0 OR MIT https://crates.io/crates/idna/0.2.3 0.2.3 Apache-2.0 OR MIT - https://crates.io/crates/idna/0.3.0 0.3.0 Apache-2.0 OR MIT + https://crates.io/crates/idna/0.4.0 0.4.0 Apache-2.0 OR MIT https://crates.io/crates/indexmap/1.9.3 1.9.3 Apache-2.0 OR MIT - https://crates.io/crates/ipconfig/0.3.1 0.3.1 Apache-2.0 OR MIT - https://crates.io/crates/ipnet/2.7.1 2.7.1 Apache-2.0 OR MIT + https://crates.io/crates/indexmap/2.0.0 2.0.0 Apache-2.0 OR MIT + https://crates.io/crates/ipconfig/0.3.2 0.3.2 Apache-2.0 OR MIT + https://crates.io/crates/ipnet/2.8.0 2.8.0 Apache-2.0 OR MIT https://crates.io/crates/itertools/0.10.5 0.10.5 Apache-2.0 OR MIT - https://crates.io/crates/itoa/1.0.6 1.0.6 Apache-2.0 OR MIT - https://crates.io/crates/js-sys/0.3.62 0.3.62 Apache-2.0 OR MIT + https://crates.io/crates/itoa/1.0.9 1.0.9 Apache-2.0 OR MIT + https://crates.io/crates/js-sys/0.3.64 0.3.64 Apache-2.0 OR MIT https://crates.io/crates/lazy_static/1.4.0 1.4.0 Apache-2.0 OR MIT https://crates.io/crates/lazycell/1.3.0 1.3.0 Apache-2.0 OR MIT - https://crates.io/crates/libc/0.2.144 0.2.144 Apache-2.0 OR MIT - https://crates.io/crates/libm/0.2.6 0.2.6 Apache-2.0 OR MIT - https://crates.io/crates/link-cplusplus/1.0.8 1.0.8 Apache-2.0 OR MIT + https://crates.io/crates/libc/0.2.147 0.2.147 Apache-2.0 OR MIT + https://crates.io/crates/libm/0.2.7 0.2.7 Apache-2.0 OR MIT + https://crates.io/crates/libz-sys/1.1.12 1.1.12 Apache-2.0 OR MIT https://crates.io/crates/linked-hash-map/0.5.6 0.5.6 Apache-2.0 OR MIT - https://crates.io/crates/lock_api/0.4.9 0.4.9 Apache-2.0 OR MIT - https://crates.io/crates/log/0.4.17 0.4.17 Apache-2.0 OR MIT + https://crates.io/crates/lock_api/0.4.10 0.4.10 Apache-2.0 OR MIT + https://crates.io/crates/log/0.4.19 0.4.19 Apache-2.0 OR MIT https://crates.io/crates/lru-cache/0.1.2 0.1.2 Apache-2.0 OR MIT https://crates.io/crates/match_cfg/0.1.0 0.1.0 Apache-2.0 OR MIT https://crates.io/crates/mime/0.3.17 0.3.17 Apache-2.0 OR MIT https://crates.io/crates/minimal-lexical/0.2.1 0.2.1 Apache-2.0 OR MIT https://crates.io/crates/multimap/0.8.3 0.8.3 Apache-2.0 OR MIT https://crates.io/crates/native-tls/0.2.11 0.2.11 Apache-2.0 OR MIT - https://crates.io/crates/num-integer/0.1.45 0.1.45 Apache-2.0 OR MIT - https://crates.io/crates/num-traits/0.2.15 0.2.15 Apache-2.0 OR MIT - https://crates.io/crates/num_cpus/1.15.0 1.15.0 Apache-2.0 OR MIT - https://crates.io/crates/object/0.30.3 0.30.3 Apache-2.0 OR MIT - https://crates.io/crates/once_cell/1.17.1 1.17.1 Apache-2.0 OR MIT - https://crates.io/crates/openssl-macros/0.1.0 0.1.0 Apache-2.0 OR MIT + https://crates.io/crates/num-traits/0.2.16 0.2.16 Apache-2.0 OR MIT + https://crates.io/crates/num_cpus/1.16.0 1.16.0 Apache-2.0 OR MIT + https://crates.io/crates/object/0.31.1 0.31.1 Apache-2.0 OR MIT + https://crates.io/crates/once_cell/1.18.0 1.18.0 Apache-2.0 OR MIT + https://crates.io/crates/openssl-macros/0.1.1 0.1.1 Apache-2.0 OR MIT https://crates.io/crates/openssl-probe/0.1.5 0.1.5 Apache-2.0 OR MIT https://crates.io/crates/parking_lot/0.12.1 0.12.1 Apache-2.0 OR MIT - https://crates.io/crates/parking_lot_core/0.9.7 0.9.7 Apache-2.0 OR MIT + https://crates.io/crates/parking_lot_core/0.9.8 0.9.8 Apache-2.0 OR MIT https://crates.io/crates/peeking_take_while/0.1.2 0.1.2 Apache-2.0 OR MIT - https://crates.io/crates/percent-encoding/2.2.0 2.2.0 Apache-2.0 OR MIT - https://crates.io/crates/pest/2.5.6 2.5.6 Apache-2.0 OR MIT - https://crates.io/crates/pest_derive/2.5.6 2.5.6 Apache-2.0 OR MIT - https://crates.io/crates/pest_generator/2.5.6 2.5.6 Apache-2.0 OR MIT - https://crates.io/crates/pest_meta/2.5.6 2.5.6 Apache-2.0 OR MIT + https://crates.io/crates/percent-encoding/2.3.0 2.3.0 Apache-2.0 OR MIT + https://crates.io/crates/pest/2.7.2 2.7.2 Apache-2.0 OR MIT + https://crates.io/crates/pest_derive/2.7.2 2.7.2 Apache-2.0 OR MIT + https://crates.io/crates/pest_generator/2.7.2 2.7.2 Apache-2.0 OR MIT + https://crates.io/crates/pest_meta/2.7.2 2.7.2 Apache-2.0 OR MIT https://crates.io/crates/petgraph/0.6.3 0.6.3 Apache-2.0 OR MIT - https://crates.io/crates/pin-project/1.1.0 1.1.0 Apache-2.0 OR MIT - https://crates.io/crates/pin-project-internal/1.1.0 1.1.0 Apache-2.0 OR MIT - https://crates.io/crates/pin-project-lite/0.2.9 0.2.9 Apache-2.0 OR MIT + https://crates.io/crates/pin-project/1.1.2 1.1.2 Apache-2.0 OR MIT + https://crates.io/crates/pin-project-internal/1.1.2 1.1.2 Apache-2.0 OR MIT + https://crates.io/crates/pin-project-lite/0.2.10 0.2.10 Apache-2.0 OR MIT https://crates.io/crates/pin-utils/0.1.0 0.1.0 Apache-2.0 OR MIT - https://crates.io/crates/pkg-config/0.3.26 0.3.26 Apache-2.0 OR MIT + https://crates.io/crates/pkg-config/0.3.27 0.3.27 Apache-2.0 OR MIT https://crates.io/crates/portable-atomic/0.3.20 0.3.20 Apache-2.0 OR MIT - https://crates.io/crates/portable-atomic/1.3.2 1.3.2 Apache-2.0 OR MIT + https://crates.io/crates/portable-atomic/1.4.2 1.4.2 Apache-2.0 OR MIT https://crates.io/crates/ppv-lite86/0.2.17 0.2.17 Apache-2.0 OR MIT https://crates.io/crates/prettyplease/0.1.25 0.1.25 Apache-2.0 OR MIT - https://crates.io/crates/proc-macro2/1.0.59 1.0.59 Apache-2.0 OR MIT + https://crates.io/crates/proc-macro2/1.0.66 1.0.66 Apache-2.0 OR MIT https://crates.io/crates/quick-error/1.2.3 1.2.3 Apache-2.0 OR MIT - https://crates.io/crates/quote/1.0.28 1.0.28 Apache-2.0 OR MIT + https://crates.io/crates/quote/1.0.32 1.0.32 Apache-2.0 OR MIT https://crates.io/crates/rand/0.8.5 0.8.5 Apache-2.0 OR MIT https://crates.io/crates/rand_chacha/0.3.1 0.3.1 Apache-2.0 OR MIT https://crates.io/crates/rand_core/0.6.4 0.6.4 Apache-2.0 OR MIT - https://crates.io/crates/regex/1.8.1 1.8.1 Apache-2.0 OR MIT - https://crates.io/crates/regex-syntax/0.7.1 0.7.1 Apache-2.0 OR MIT + https://crates.io/crates/regex/1.9.1 1.9.1 Apache-2.0 OR MIT + https://crates.io/crates/regex-automata/0.3.4 0.3.4 Apache-2.0 OR MIT + https://crates.io/crates/regex-syntax/0.7.4 0.7.4 Apache-2.0 OR MIT https://crates.io/crates/reqwest/0.11.18 0.11.18 Apache-2.0 OR MIT https://crates.io/crates/resolv-conf/0.7.0 0.7.0 Apache-2.0 OR MIT https://crates.io/crates/rustc-demangle/0.1.23 0.1.23 Apache-2.0 OR MIT https://crates.io/crates/rustc-hash/1.1.0 1.1.0 Apache-2.0 OR MIT https://crates.io/crates/rustc_version/0.4.0 0.4.0 Apache-2.0 OR MIT - https://crates.io/crates/rustversion/1.0.12 1.0.12 Apache-2.0 OR MIT - https://crates.io/crates/scopeguard/1.1.0 1.1.0 Apache-2.0 OR MIT - https://crates.io/crates/scratch/1.0.3 1.0.3 Apache-2.0 OR MIT - https://crates.io/crates/security-framework/2.7.0 2.7.0 Apache-2.0 OR MIT - https://crates.io/crates/security-framework-sys/2.8.0 2.8.0 Apache-2.0 OR MIT - https://crates.io/crates/semver/1.0.17 1.0.17 Apache-2.0 OR MIT - https://crates.io/crates/serde/1.0.163 1.0.163 Apache-2.0 OR MIT - https://crates.io/crates/serde_derive/1.0.163 1.0.163 Apache-2.0 OR MIT - https://crates.io/crates/serde_json/1.0.96 1.0.96 Apache-2.0 OR MIT - https://crates.io/crates/serde_path_to_error/0.1.11 0.1.11 Apache-2.0 OR MIT + https://crates.io/crates/rustversion/1.0.14 1.0.14 Apache-2.0 OR MIT + https://crates.io/crates/scopeguard/1.2.0 1.2.0 Apache-2.0 OR MIT + https://crates.io/crates/security-framework/2.9.2 2.9.2 Apache-2.0 OR MIT + https://crates.io/crates/security-framework-sys/2.9.1 2.9.1 Apache-2.0 OR MIT + https://crates.io/crates/semver/1.0.18 1.0.18 Apache-2.0 OR MIT + https://crates.io/crates/serde/1.0.180 1.0.180 Apache-2.0 OR MIT + https://crates.io/crates/serde_derive/1.0.180 1.0.180 Apache-2.0 OR MIT + https://crates.io/crates/serde_json/1.0.104 1.0.104 Apache-2.0 OR MIT + https://crates.io/crates/serde_path_to_error/0.1.14 0.1.14 Apache-2.0 OR MIT https://crates.io/crates/serde_urlencoded/0.7.1 0.7.1 Apache-2.0 OR MIT - https://crates.io/crates/sha2/0.10.6 0.10.6 Apache-2.0 OR MIT + https://crates.io/crates/sha2/0.10.7 0.10.7 Apache-2.0 OR MIT https://crates.io/crates/shlex/1.1.0 1.1.0 Apache-2.0 OR MIT https://crates.io/crates/signal-hook-registry/1.4.1 1.4.1 Apache-2.0 OR MIT https://crates.io/crates/siphasher/0.3.10 0.3.10 Apache-2.0 OR MIT https://crates.io/crates/slug/0.1.4 0.1.4 Apache-2.0 OR MIT - https://crates.io/crates/smallvec/1.10.0 1.10.0 Apache-2.0 OR MIT + https://crates.io/crates/smallvec/1.11.0 1.11.0 Apache-2.0 OR MIT https://crates.io/crates/socket2/0.4.9 0.4.9 Apache-2.0 OR MIT + https://crates.io/crates/socket2/0.5.3 0.5.3 Apache-2.0 OR MIT https://crates.io/crates/syn/1.0.109 1.0.109 Apache-2.0 OR MIT - https://crates.io/crates/syn/2.0.18 2.0.18 Apache-2.0 OR MIT - https://crates.io/crates/tempfile/3.5.0 3.5.0 Apache-2.0 OR MIT - https://crates.io/crates/thiserror/1.0.40 1.0.40 Apache-2.0 OR MIT - https://crates.io/crates/thiserror-impl/1.0.40 1.0.40 Apache-2.0 OR MIT + https://crates.io/crates/syn/2.0.28 2.0.28 Apache-2.0 OR MIT + https://crates.io/crates/tempfile/3.7.0 3.7.0 Apache-2.0 OR MIT + https://crates.io/crates/thiserror/1.0.44 1.0.44 Apache-2.0 OR MIT + https://crates.io/crates/thiserror-impl/1.0.44 1.0.44 Apache-2.0 OR MIT https://crates.io/crates/thread_local/1.1.4 1.1.4 Apache-2.0 OR MIT - https://crates.io/crates/time/0.3.21 0.3.21 Apache-2.0 OR MIT + https://crates.io/crates/time/0.3.23 0.3.23 Apache-2.0 OR MIT https://crates.io/crates/time-core/0.1.1 0.1.1 Apache-2.0 OR MIT https://crates.io/crates/tokio-io-timeout/1.2.0 1.2.0 Apache-2.0 OR MIT https://crates.io/crates/tokio-rustls/0.23.4 0.23.4 Apache-2.0 OR MIT https://crates.io/crates/trust-dns-proto/0.22.0 0.22.0 Apache-2.0 OR MIT https://crates.io/crates/trust-dns-resolver/0.22.0 0.22.0 Apache-2.0 OR MIT https://crates.io/crates/typenum/1.16.0 1.16.0 Apache-2.0 OR MIT - https://crates.io/crates/ucd-trie/0.1.5 0.1.5 Apache-2.0 OR MIT - https://crates.io/crates/uncased/0.9.7 0.9.7 Apache-2.0 OR MIT + https://crates.io/crates/ucd-trie/0.1.6 0.1.6 Apache-2.0 OR MIT + https://crates.io/crates/uncased/0.9.9 0.9.9 Apache-2.0 OR MIT https://crates.io/crates/unic-char-property/0.9.0 0.9.0 Apache-2.0 OR MIT https://crates.io/crates/unic-char-range/0.9.0 0.9.0 Apache-2.0 OR MIT https://crates.io/crates/unic-common/0.9.0 0.9.0 Apache-2.0 OR MIT https://crates.io/crates/unic-segment/0.9.0 0.9.0 Apache-2.0 OR MIT https://crates.io/crates/unic-ucd-segment/0.9.0 0.9.0 Apache-2.0 OR MIT https://crates.io/crates/unic-ucd-version/0.9.0 0.9.0 Apache-2.0 OR MIT - https://crates.io/crates/unicode-bidi/0.3.8 0.3.8 Apache-2.0 OR MIT + https://crates.io/crates/unicode-bidi/0.3.13 0.3.13 Apache-2.0 OR MIT https://crates.io/crates/unicode-normalization/0.1.22 0.1.22 Apache-2.0 OR MIT - https://crates.io/crates/unicode-width/0.1.10 0.1.10 Apache-2.0 OR MIT - https://crates.io/crates/url/2.3.1 2.3.1 Apache-2.0 OR MIT + https://crates.io/crates/url/2.4.0 2.4.0 Apache-2.0 OR MIT https://crates.io/crates/utf8parse/0.2.1 0.2.1 Apache-2.0 OR MIT - https://crates.io/crates/uuid/1.3.3 1.3.3 Apache-2.0 OR MIT + https://crates.io/crates/uuid/1.4.1 1.4.1 Apache-2.0 OR MIT https://crates.io/crates/vcpkg/0.2.15 0.2.15 Apache-2.0 OR MIT https://crates.io/crates/version_check/0.9.4 0.9.4 Apache-2.0 OR MIT - https://crates.io/crates/wasm-bindgen/0.2.85 0.2.85 Apache-2.0 OR MIT - https://crates.io/crates/wasm-bindgen-backend/0.2.85 0.2.85 Apache-2.0 OR MIT - https://crates.io/crates/wasm-bindgen-futures/0.4.35 0.4.35 Apache-2.0 OR MIT - https://crates.io/crates/wasm-bindgen-macro/0.2.85 0.2.85 Apache-2.0 OR MIT - https://crates.io/crates/wasm-bindgen-macro-support/0.2.85 0.2.85 Apache-2.0 OR MIT - https://crates.io/crates/wasm-bindgen-shared/0.2.85 0.2.85 Apache-2.0 OR MIT + https://crates.io/crates/wasm-bindgen/0.2.87 0.2.87 Apache-2.0 OR MIT + https://crates.io/crates/wasm-bindgen-backend/0.2.87 0.2.87 Apache-2.0 OR MIT + https://crates.io/crates/wasm-bindgen-futures/0.4.37 0.4.37 Apache-2.0 OR MIT + https://crates.io/crates/wasm-bindgen-macro/0.2.87 0.2.87 Apache-2.0 OR MIT + https://crates.io/crates/wasm-bindgen-macro-support/0.2.87 0.2.87 Apache-2.0 OR MIT + https://crates.io/crates/wasm-bindgen-shared/0.2.87 0.2.87 Apache-2.0 OR MIT https://crates.io/crates/wasm-streams/0.2.3 0.2.3 Apache-2.0 OR MIT - https://crates.io/crates/web-sys/0.3.60 0.3.60 Apache-2.0 OR MIT - https://crates.io/crates/widestring/0.5.1 0.5.1 Apache-2.0 OR MIT + https://crates.io/crates/web-sys/0.3.64 0.3.64 Apache-2.0 OR MIT + https://crates.io/crates/widestring/1.0.2 1.0.2 Apache-2.0 OR MIT https://crates.io/crates/winapi/0.3.9 0.3.9 Apache-2.0 OR MIT https://crates.io/crates/winapi-i686-pc-windows-gnu/0.4.0 0.4.0 Apache-2.0 OR MIT https://crates.io/crates/winapi-x86_64-pc-windows-gnu/0.4.0 0.4.0 Apache-2.0 OR MIT - https://crates.io/crates/windows-sys/0.42.0 0.42.0 Apache-2.0 OR MIT - https://crates.io/crates/windows-sys/0.45.0 0.45.0 Apache-2.0 OR MIT + https://crates.io/crates/windows/0.48.0 0.48.0 Apache-2.0 OR MIT https://crates.io/crates/windows-sys/0.48.0 0.48.0 Apache-2.0 OR MIT - https://crates.io/crates/windows-targets/0.42.2 0.42.2 Apache-2.0 OR MIT - https://crates.io/crates/windows-targets/0.48.0 0.48.0 Apache-2.0 OR MIT - https://crates.io/crates/windows_aarch64_gnullvm/0.42.2 0.42.2 Apache-2.0 OR MIT + https://crates.io/crates/windows-targets/0.48.1 0.48.1 Apache-2.0 OR MIT https://crates.io/crates/windows_aarch64_gnullvm/0.48.0 0.48.0 Apache-2.0 OR MIT - https://crates.io/crates/windows_aarch64_msvc/0.42.2 0.42.2 Apache-2.0 OR MIT https://crates.io/crates/windows_aarch64_msvc/0.48.0 0.48.0 Apache-2.0 OR MIT - https://crates.io/crates/windows_i686_gnu/0.42.2 0.42.2 Apache-2.0 OR MIT https://crates.io/crates/windows_i686_gnu/0.48.0 0.48.0 Apache-2.0 OR MIT - https://crates.io/crates/windows_i686_msvc/0.42.2 0.42.2 Apache-2.0 OR MIT https://crates.io/crates/windows_i686_msvc/0.48.0 0.48.0 Apache-2.0 OR MIT - https://crates.io/crates/windows_x86_64_gnu/0.42.2 0.42.2 Apache-2.0 OR MIT https://crates.io/crates/windows_x86_64_gnu/0.48.0 0.48.0 Apache-2.0 OR MIT - https://crates.io/crates/windows_x86_64_gnullvm/0.42.2 0.42.2 Apache-2.0 OR MIT https://crates.io/crates/windows_x86_64_gnullvm/0.48.0 0.48.0 Apache-2.0 OR MIT - https://crates.io/crates/windows_x86_64_msvc/0.42.2 0.42.2 Apache-2.0 OR MIT https://crates.io/crates/windows_x86_64_msvc/0.48.0 0.48.0 Apache-2.0 OR MIT ======================================================================== @@ -475,9 +463,9 @@ Apache-2.0 OR MIT OR Zlib licenses The following components are provided under the Apache-2.0 OR MIT OR Zlib License. See project link for details. The text of each license is also included in licenses/LICENSE-[project].txt. - https://crates.io/crates/miniz_oxide/0.6.2 0.6.2 Apache-2.0 OR MIT OR Zlib + https://crates.io/crates/miniz_oxide/0.7.1 0.7.1 Apache-2.0 OR MIT OR Zlib https://crates.io/crates/tinyvec/1.6.0 1.6.0 Apache-2.0 OR MIT OR Zlib - https://crates.io/crates/tinyvec_macros/0.1.0 0.1.0 Apache-2.0 OR MIT OR Zlib + https://crates.io/crates/tinyvec_macros/0.1.1 0.1.1 Apache-2.0 OR MIT OR Zlib ======================================================================== BSD-3-Clause licenses @@ -486,8 +474,7 @@ The following components are provided under the BSD-3-Clause License. See projec The text of each license is also included in licenses/LICENSE-[project].txt. https://crates.io/crates/bindgen/0.63.0 0.63.0 BSD-3-Clause - https://crates.io/crates/deunicode/0.4.3 0.4.3 BSD-3-Clause - https://crates.io/crates/instant/0.1.12 0.1.12 BSD-3-Clause + https://crates.io/crates/deunicode/0.4.4 0.4.4 BSD-3-Clause ======================================================================== ISC licenses @@ -515,25 +502,24 @@ The text of each license is also included in licenses/LICENSE-[project].txt. https://crates.io/crates/async-stream/0.3.5 0.3.5 MIT https://crates.io/crates/async-stream-impl/0.3.5 0.3.5 MIT - https://crates.io/crates/axum/0.6.18 0.6.18 MIT + https://crates.io/crates/axum/0.6.19 0.6.19 MIT https://crates.io/crates/axum-core/0.3.4 0.3.4 MIT https://crates.io/crates/bincode/1.3.3 1.3.3 MIT https://crates.io/crates/bytes/1.4.0 1.4.0 MIT https://crates.io/crates/convert_case/0.4.0 0.4.0 MIT - https://crates.io/crates/dashmap/5.4.0 5.4.0 MIT - https://crates.io/crates/data-encoding/2.3.3 2.3.3 MIT + https://crates.io/crates/dashmap/5.5.0 5.5.0 MIT + https://crates.io/crates/data-encoding/2.4.0 2.4.0 MIT https://crates.io/crates/derive_more/0.99.17 0.99.17 MIT https://crates.io/crates/errno-dragonfly/0.1.2 0.1.2 MIT - https://crates.io/crates/generic-array/0.14.6 0.14.6 MIT + https://crates.io/crates/generic-array/0.14.7 0.14.7 MIT https://crates.io/crates/globwalk/0.8.1 0.8.1 MIT - https://crates.io/crates/h2/0.3.19 0.3.19 MIT + https://crates.io/crates/h2/0.3.20 0.3.20 MIT https://crates.io/crates/hostname/0.3.1 0.3.1 MIT https://crates.io/crates/http-body/0.4.5 0.4.5 MIT - https://crates.io/crates/hyper/0.14.26 0.14.26 MIT - https://crates.io/crates/is-terminal/0.4.7 0.4.7 MIT - https://crates.io/crates/matches/0.1.9 0.1.9 MIT - https://crates.io/crates/matchit/0.7.0 0.7.0 MIT - https://crates.io/crates/mio/0.8.6 0.8.6 MIT + https://crates.io/crates/hyper/0.14.27 0.14.27 MIT + https://crates.io/crates/is-terminal/0.4.9 0.4.9 MIT + https://crates.io/crates/matches/0.1.10 0.1.10 MIT + https://crates.io/crates/mio/0.8.8 0.8.8 MIT https://crates.io/crates/nom/7.1.3 7.1.3 MIT https://crates.io/crates/nu-ansi-term/0.46.0 0.46.0 MIT https://crates.io/crates/openssl-sys/0.9.90 0.9.90 MIT @@ -543,17 +529,16 @@ The text of each license is also included in licenses/LICENSE-[project].txt. https://crates.io/crates/phf_codegen/0.10.0 0.10.0 MIT https://crates.io/crates/phf_generator/0.10.0 0.10.0 MIT https://crates.io/crates/phf_shared/0.10.0 0.10.0 MIT - https://crates.io/crates/redox_syscall/0.2.16 0.2.16 MIT https://crates.io/crates/redox_syscall/0.3.5 0.3.5 MIT - https://crates.io/crates/schannel/0.1.21 0.1.21 MIT + https://crates.io/crates/schannel/0.1.22 0.1.22 MIT https://crates.io/crates/sharded-slab/0.1.4 0.1.4 MIT https://crates.io/crates/slab/0.4.8 0.4.8 MIT https://crates.io/crates/spin/0.5.2 0.5.2 MIT https://crates.io/crates/strsim/0.10.0 0.10.0 MIT - https://crates.io/crates/tera/1.18.1 1.18.1 MIT - https://crates.io/crates/tokio/1.28.1 1.28.1 MIT + https://crates.io/crates/tera/1.19.0 1.19.0 MIT + https://crates.io/crates/tokio/1.29.1 1.29.1 MIT https://crates.io/crates/tokio-macros/2.1.0 2.1.0 MIT - https://crates.io/crates/tokio-native-tls/0.3.0 0.3.0 MIT + https://crates.io/crates/tokio-native-tls/0.3.1 0.3.1 MIT https://crates.io/crates/tokio-stream/0.1.14 0.1.14 MIT https://crates.io/crates/tokio-util/0.7.8 0.7.8 MIT https://crates.io/crates/tonic/0.8.3 0.8.3 MIT @@ -562,16 +547,25 @@ The text of each license is also included in licenses/LICENSE-[project].txt. https://crates.io/crates/tower-layer/0.3.2 0.3.2 MIT https://crates.io/crates/tower-service/0.3.2 0.3.2 MIT https://crates.io/crates/tracing/0.1.37 0.1.37 MIT - https://crates.io/crates/tracing-attributes/0.1.24 0.1.24 MIT + https://crates.io/crates/tracing-attributes/0.1.26 0.1.26 MIT https://crates.io/crates/tracing-core/0.1.31 0.1.31 MIT https://crates.io/crates/tracing-futures/0.2.5 0.2.5 MIT https://crates.io/crates/tracing-log/0.1.3 0.1.3 MIT https://crates.io/crates/tracing-subscriber/0.3.17 0.3.17 MIT https://crates.io/crates/try-lock/0.2.4 0.2.4 MIT https://crates.io/crates/valuable/0.1.0 0.1.0 MIT - https://crates.io/crates/want/0.3.0 0.3.0 MIT + https://crates.io/crates/want/0.3.1 0.3.1 MIT https://crates.io/crates/which/4.4.0 4.4.0 MIT https://crates.io/crates/winreg/0.10.1 0.10.1 MIT + https://crates.io/crates/winreg/0.50.0 0.50.0 MIT + +======================================================================== +MIT AND BSD-3-Clause licenses +======================================================================== +The following components are provided under the MIT AND BSD-3-Clause License. See project link for details. +The text of each license is also included in licenses/LICENSE-[project].txt. + + https://crates.io/crates/matchit/0.7.1 0.7.1 MIT AND BSD-3-Clause ======================================================================== MIT OR Unlicense licenses @@ -579,14 +573,12 @@ MIT OR Unlicense licenses The following components are provided under the MIT OR Unlicense License. See project link for details. The text of each license is also included in licenses/LICENSE-[project].txt. - https://crates.io/crates/aho-corasick/0.7.20 0.7.20 MIT OR Unlicense - https://crates.io/crates/aho-corasick/1.0.1 1.0.1 MIT OR Unlicense - https://crates.io/crates/globset/0.4.10 0.4.10 MIT OR Unlicense - https://crates.io/crates/ignore/0.4.19 0.4.19 MIT OR Unlicense + https://crates.io/crates/aho-corasick/1.0.2 1.0.2 MIT OR Unlicense + https://crates.io/crates/globset/0.4.12 0.4.12 MIT OR Unlicense + https://crates.io/crates/ignore/0.4.20 0.4.20 MIT OR Unlicense https://crates.io/crates/memchr/2.5.0 2.5.0 MIT OR Unlicense https://crates.io/crates/same-file/1.0.6 1.0.6 MIT OR Unlicense - https://crates.io/crates/termcolor/1.2.0 1.2.0 MIT OR Unlicense - https://crates.io/crates/walkdir/2.3.2 2.3.2 MIT OR Unlicense + https://crates.io/crates/walkdir/2.3.3 2.3.3 MIT OR Unlicense https://crates.io/crates/winapi-util/0.1.5 0.1.5 MIT OR Unlicense ======================================================================== diff --git a/scripts/Cargo.toml b/scripts/Cargo.toml index b17845f..8e0aeb7 100644 --- a/scripts/Cargo.toml +++ b/scripts/Cargo.toml @@ -25,10 +25,10 @@ license = "Apache-2.0" publish = false [dependencies] -anyhow = "1.0.71" -chrono = { version = "0.4.24", default-features = false, features = ["std"] } -clap = { version = "4.3.0", features = ["derive"] } -serde = { version = "1.0.163", features = ["derive"] } -tera = "1.18.1" +anyhow = "1.0.72" +chrono = { version = "0.4.26", default-features = false, features = ["std"] } +clap = { version = "4.3.19", features = ["derive"] } +serde = { version = "1.0.180", features = ["derive"] } +tera = "1.19.0" tracing = "0.1.37" tracing-subscriber = "0.3.17" diff --git a/src/context.rs b/src/context.rs index da7f234..c586ada 100644 --- a/src/context.rs +++ b/src/context.rs @@ -18,7 +18,7 @@ use dashmap::DashMap; use once_cell::sync::Lazy; use skywalking::trace::{ propagation::encoder::encode_propagation, - span::{AbstractSpan, Span}, + span::{HandleSpanObject, Span}, trace_context::TracingContext, }; diff --git a/src/plugin/mod.rs b/src/plugin/mod.rs index 8ee7c16..6c41c00 100644 --- a/src/plugin/mod.rs +++ b/src/plugin/mod.rs @@ -26,7 +26,7 @@ mod plugin_swoole; use crate::execute::{AfterExecuteHook, BeforeExecuteHook}; use once_cell::sync::Lazy; use phper::{eg, objects::ZObj}; -use skywalking::trace::span::AbstractSpan; +use skywalking::trace::span::HandleSpanObject; use std::{collections::HashMap, ops::Deref, sync::Mutex}; use tracing::error; @@ -109,7 +109,7 @@ fn select_plugin(class_name: Option<&str>, function_name: &str) -> Option<&'stat selected_plugin.map(AsRef::as_ref) } -fn log_exception(span: &mut impl AbstractSpan) -> Option<&mut ZObj> { +fn log_exception(span: &mut impl HandleSpanObject) -> Option<&mut ZObj> { let mut ex = unsafe { ZObj::try_from_mut_ptr(eg!(exception)) }; if let Some(ex) = ex.as_mut() { let mut span_object = span.span_object_mut(); diff --git a/src/plugin/plugin_amqplib.rs b/src/plugin/plugin_amqplib.rs index eeab1fc..5cffc35 100644 --- a/src/plugin/plugin_amqplib.rs +++ b/src/plugin/plugin_amqplib.rs @@ -30,7 +30,7 @@ use phper::{ }; use skywalking::{ proto::v3::SpanLayer, - trace::span::{AbstractSpan, Span}, + trace::span::{HandleSpanObject, Span}, }; #[derive(Default, Clone)] diff --git a/src/plugin/plugin_curl.rs b/src/plugin/plugin_curl.rs index 1b8142e..db8d9c3 100644 --- a/src/plugin/plugin_curl.rs +++ b/src/plugin/plugin_curl.rs @@ -27,7 +27,7 @@ use phper::{ }; use skywalking::{ proto::v3::SpanLayer, - trace::span::{AbstractSpan, AsyncSpan, Span}, + trace::span::{AsyncSpan, HandleSpanObject, Span}, }; use std::{cell::RefCell, collections::HashMap, os::raw::c_long}; use tracing::{debug, warn}; @@ -432,7 +432,7 @@ impl CurlPlugin { Ok(span) } - fn finish_exit_span(span: &mut impl AbstractSpan, ch: &ZVal) -> crate::Result<()> { + fn finish_exit_span(span: &mut impl HandleSpanObject, ch: &ZVal) -> crate::Result<()> { let result = call("curl_getinfo", &mut [ch.clone()])?; let response = result.as_z_arr().context("response in not arr")?; let http_code = response diff --git a/src/plugin/plugin_memcached.rs b/src/plugin/plugin_memcached.rs index 41850e9..76db990 100644 --- a/src/plugin/plugin_memcached.rs +++ b/src/plugin/plugin_memcached.rs @@ -30,7 +30,7 @@ use phper::{ }; use skywalking::{ proto::v3::SpanLayer, - trace::span::{AbstractSpan, Span}, + trace::span::{HandleSpanObject, Span}, }; use tracing::{debug, instrument, warn}; diff --git a/src/plugin/plugin_mongodb.rs b/src/plugin/plugin_mongodb.rs index 53b58ab..eeb6594 100644 --- a/src/plugin/plugin_mongodb.rs +++ b/src/plugin/plugin_mongodb.rs @@ -26,7 +26,7 @@ use phper::{ }; use skywalking::{ proto::v3::SpanLayer, - trace::span::{AbstractSpan, Span}, + trace::span::{HandleSpanObject, Span}, }; use std::any::Any; use tracing::{debug, error}; diff --git a/src/plugin/plugin_mysqli.rs b/src/plugin/plugin_mysqli.rs index 869bdb6..2465efa 100644 --- a/src/plugin/plugin_mysqli.rs +++ b/src/plugin/plugin_mysqli.rs @@ -25,7 +25,7 @@ use once_cell::sync::Lazy; use phper::{objects::ZObj, sys}; use skywalking::{ proto::v3::SpanLayer, - trace::span::{AbstractSpan, Span}, + trace::span::{HandleSpanObject, Span}, }; use tracing::debug; diff --git a/src/plugin/plugin_pdo.rs b/src/plugin/plugin_pdo.rs index c4a32b9..9ae5702 100644 --- a/src/plugin/plugin_pdo.rs +++ b/src/plugin/plugin_pdo.rs @@ -32,7 +32,7 @@ use phper::{ }; use skywalking::{ proto::v3::SpanLayer, - trace::span::{AbstractSpan, Span}, + trace::span::{HandleSpanObject, Span}, }; use std::{any::Any, str::FromStr}; use tracing::{debug, warn}; diff --git a/src/plugin/plugin_predis.rs b/src/plugin/plugin_predis.rs index ca7ab7e..ce36069 100644 --- a/src/plugin/plugin_predis.rs +++ b/src/plugin/plugin_predis.rs @@ -25,7 +25,7 @@ use once_cell::sync::Lazy; use phper::{eg, functions::call, values::ZVal}; use skywalking::{ proto::v3::SpanLayer, - trace::span::{AbstractSpan, Span}, + trace::span::{HandleSpanObject, Span}, }; use std::collections::HashSet; use tracing::debug; diff --git a/src/plugin/plugin_redis.rs b/src/plugin/plugin_redis.rs index c2254e7..f83f7a1 100644 --- a/src/plugin/plugin_redis.rs +++ b/src/plugin/plugin_redis.rs @@ -30,7 +30,7 @@ use phper::{ }; use skywalking::{ proto::v3::SpanLayer, - trace::span::{AbstractSpan, Span}, + trace::span::{HandleSpanObject, Span}, }; use std::{any::Any, collections::HashMap}; use tracing::{debug, warn}; diff --git a/src/request.rs b/src/request.rs index 7053e2c..e5c06cf 100644 --- a/src/request.rs +++ b/src/request.rs @@ -23,7 +23,7 @@ use anyhow::{anyhow, Context}; use dashmap::DashMap; use once_cell::sync::Lazy; use phper::{arrays::ZArr, eg, pg, sg, sys, values::ZVal}; -use skywalking::trace::{propagation::decoder::decode_propagation, span::AbstractSpan, tracer}; +use skywalking::trace::{propagation::decoder::decode_propagation, span::HandleSpanObject, tracer}; use std::{ panic::AssertUnwindSafe, ptr::null_mut, diff --git a/src/worker.rs b/src/worker.rs index 19210db..282e7d0 100644 --- a/src/worker.rs +++ b/src/worker.rs @@ -28,10 +28,7 @@ use once_cell::sync::Lazy; use phper::ini::ini_get; use skywalking::{ management::{instance::Properties, manager::Manager}, - reporter::{ - grpc::{CollectItemConsume, GrpcReporter}, - CollectItem, - }, + reporter::{grpc::GrpcReporter, CollectItem, CollectItemConsume}, }; use std::{ cmp::Ordering, error::Error, ffi::CStr, fs, io, marker::PhantomData, num::NonZeroUsize, From c214ee18ac8a46ace2b2be854093b6242263257c Mon Sep 17 00:00:00 2001 From: jmjoy Date: Wed, 2 Aug 2023 22:23:15 +0800 Subject: [PATCH 2/2] Clippy. --- src/plugin/mod.rs | 2 +- src/plugin/plugin_amqplib.rs | 2 +- src/plugin/plugin_curl.rs | 8 +++----- src/plugin/plugin_memcached.rs | 6 +++--- src/plugin/plugin_mongodb.rs | 2 +- src/plugin/plugin_mysqli.rs | 2 +- src/plugin/plugin_pdo.rs | 4 ++-- src/plugin/plugin_predis.rs | 2 +- src/plugin/plugin_redis.rs | 4 ++-- src/request.rs | 2 +- 10 files changed, 16 insertions(+), 18 deletions(-) diff --git a/src/plugin/mod.rs b/src/plugin/mod.rs index 6c41c00..a9264de 100644 --- a/src/plugin/mod.rs +++ b/src/plugin/mod.rs @@ -112,7 +112,7 @@ fn select_plugin(class_name: Option<&str>, function_name: &str) -> Option<&'stat fn log_exception(span: &mut impl HandleSpanObject) -> Option<&mut ZObj> { let mut ex = unsafe { ZObj::try_from_mut_ptr(eg!(exception)) }; if let Some(ex) = ex.as_mut() { - let mut span_object = span.span_object_mut(); + let span_object = span.span_object_mut(); span_object.is_error = true; let mut logs = Vec::new(); diff --git a/src/plugin/plugin_amqplib.rs b/src/plugin/plugin_amqplib.rs index 5cffc35..ea7ce10 100644 --- a/src/plugin/plugin_amqplib.rs +++ b/src/plugin/plugin_amqplib.rs @@ -135,7 +135,7 @@ impl AmqplibPlugin { Ok(ctx.create_exit_span(&format!("{}->{}", class_name, function_name), peer)) })?; - let mut span_object = span.span_object_mut(); + let span_object = span.span_object_mut(); span_object.set_span_layer(SpanLayer::Mq); span_object.component_id = COMPONENT_AMQP_PRODUCER_ID; span_object.add_tag(TAG_MQ_BROKER, peer); diff --git a/src/plugin/plugin_curl.rs b/src/plugin/plugin_curl.rs index db8d9c3..985eef7 100644 --- a/src/plugin/plugin_curl.rs +++ b/src/plugin/plugin_curl.rs @@ -424,7 +424,7 @@ impl CurlPlugin { Ok(ctx.create_exit_span(info.url.path(), &info.peer)) })?; - let mut span_object = span.span_object_mut(); + let span_object = span.span_object_mut(); span_object.set_span_layer(SpanLayer::Http); span_object.component_id = COMPONENT_PHP_CURL_ID; span_object.add_tag("url", &info.raw_url); @@ -447,13 +447,11 @@ impl CurlPlugin { .as_z_str() .context("curl_error is not string")? .to_str()?; - let mut span_object = span.span_object_mut(); + let span_object = span.span_object_mut(); span_object.is_error = true; span_object.add_log(vec![("CURL_ERROR", curl_error)]); - } else if http_code >= 400 { - span.span_object_mut().is_error = true; } else { - span.span_object_mut().is_error = false; + span.span_object_mut().is_error = http_code >= 400; } log_exception(span); diff --git a/src/plugin/plugin_memcached.rs b/src/plugin/plugin_memcached.rs index 76db990..1e480f3 100644 --- a/src/plugin/plugin_memcached.rs +++ b/src/plugin/plugin_memcached.rs @@ -340,15 +340,15 @@ fn after_hook( Ok(()) } -fn create_exit_span<'a>( +fn create_exit_span( request_id: Option, class_name: &str, function_name: &str, remote_peer: &str, - tag_info: &TagInfo<'a>, key: Option<&str>, + tag_info: &TagInfo<'_>, key: Option<&str>, ) -> anyhow::Result { RequestContext::try_with_global_ctx(request_id, |ctx| { let mut span = ctx.create_exit_span(&format!("{}->{}", class_name, function_name), remote_peer); - let mut span_object = span.span_object_mut(); + let span_object = span.span_object_mut(); span_object.set_span_layer(SpanLayer::Cache); span_object.component_id = COMPONENT_PHP_MEMCACHED_ID; span_object.add_tag(TAG_CACHE_TYPE, "memcache"); diff --git a/src/plugin/plugin_mongodb.rs b/src/plugin/plugin_mongodb.rs index eeb6594..0ee2ade 100644 --- a/src/plugin/plugin_mongodb.rs +++ b/src/plugin/plugin_mongodb.rs @@ -121,7 +121,7 @@ fn before_manager_crud_hook( Ok(ctx.create_exit_span(&format!("{}->{}", MANAGER_CLASS_NAME, function_name), "")) })?; - let mut span_object = span.span_object_mut(); + let span_object = span.span_object_mut(); span_object.set_span_layer(SpanLayer::Database); span_object.component_id = COMPONENT_MONGODB_ID; span_object.add_tag(TAG_DB_TYPE, "MongoDB"); diff --git a/src/plugin/plugin_mysqli.rs b/src/plugin/plugin_mysqli.rs index 2465efa..8251686 100644 --- a/src/plugin/plugin_mysqli.rs +++ b/src/plugin/plugin_mysqli.rs @@ -147,7 +147,7 @@ fn create_mysqli_exit_span( &format!("{}:{}", info.hostname, info.port), ); - let mut span_object = span.span_object_mut(); + let span_object = span.span_object_mut(); span_object.set_span_layer(SpanLayer::Database); span_object.component_id = COMPONENT_PHP_MYSQLI_ID; span_object.add_tag("db.type", "mysql"); diff --git a/src/plugin/plugin_pdo.rs b/src/plugin/plugin_pdo.rs index 9ae5702..00d6ff9 100644 --- a/src/plugin/plugin_pdo.rs +++ b/src/plugin/plugin_pdo.rs @@ -241,7 +241,7 @@ fn after_hook_when_false(this: &mut ZObj, span: &mut Span) -> crate::Result<()> }; let error = get_error_info_item(info, 2)?.expect_z_str()?.to_str()?; - let mut span_object = span.span_object_mut(); + let span_object = span.span_object_mut(); span_object.is_error = true; span_object.add_log([("SQLSTATE", state), ("Error Code", code), ("Error", error)]); @@ -272,7 +272,7 @@ fn create_exit_span_with_dsn( let mut span = ctx.create_exit_span(&format!("{}->{}", class_name, function_name), &dsn.peer); - let mut span_object = span.span_object_mut(); + let span_object = span.span_object_mut(); span_object.set_span_layer(SpanLayer::Database); span_object.component_id = COMPONENT_PHP_PDO_ID; span_object.add_tag(TAG_DB_TYPE, &dsn.db_type); diff --git a/src/plugin/plugin_predis.rs b/src/plugin/plugin_predis.rs index ce36069..a9c2aaa 100644 --- a/src/plugin/plugin_predis.rs +++ b/src/plugin/plugin_predis.rs @@ -229,7 +229,7 @@ impl PredisPlugin { )) })?; - let mut span_object = span.span_object_mut(); + let span_object = span.span_object_mut(); span_object.set_span_layer(SpanLayer::Cache); span_object.component_id = COMPONENT_PHP_PREDIS_ID; span_object.add_tag(TAG_CACHE_TYPE, "redis"); diff --git a/src/plugin/plugin_redis.rs b/src/plugin/plugin_redis.rs index f83f7a1..680602d 100644 --- a/src/plugin/plugin_redis.rs +++ b/src/plugin/plugin_redis.rs @@ -259,7 +259,7 @@ impl RedisPlugin { Ok(ctx.create_exit_span(&format!("{}->{}", class_name, function_name), &addr)) })?; - let mut span_object = span.span_object_mut(); + let span_object = span.span_object_mut(); span_object.set_span_layer(SpanLayer::Cache); span_object.component_id = COMPONENT_PHP_REDIS_ID; span_object.add_tag(TAG_CACHE_TYPE, "redis"); @@ -304,7 +304,7 @@ impl RedisPlugin { Ok(ctx.create_exit_span(&format!("{}->{}", class_name, function_name), &peer)) })?; - let mut span_object = span.span_object_mut(); + let span_object = span.span_object_mut(); span_object.set_span_layer(SpanLayer::Cache); span_object.component_id = COMPONENT_PHP_REDIS_ID; span_object.add_tag(TAG_CACHE_TYPE, "redis"); diff --git a/src/request.rs b/src/request.rs index e5c06cf..e09ab35 100644 --- a/src/request.rs +++ b/src/request.rs @@ -300,7 +300,7 @@ fn create_request_context( None => ctx.create_entry_span(&operation_name), }; - let mut span_object = span.span_object_mut(); + let span_object = span.span_object_mut(); span_object.component_id = COMPONENT_PHP_ID; span_object.add_tag("url", url.to_string()); span_object.add_tag("http.method", method);