diff --git a/Cargo.lock b/Cargo.lock index 31c85664..72a5f091 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -23,7 +23,7 @@ version = "0.7.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "891477e0c6a8957309ee5c45a6368af3ae14bb510732d2684ffa19af310920f9" dependencies = [ - "getrandom", + "getrandom 0.2.15", "once_cell", "version_check", ] @@ -846,7 +846,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0dc92fb57ca44df6db8059111ab3af99a63d5d0f8375d9972e319a379c6bab76" dependencies = [ "generic-array 0.14.7", - "rand_core", + "rand_core 0.6.4", "subtle", "zeroize", ] @@ -1102,7 +1102,7 @@ dependencies = [ "hkdf", "pem-rfc7468", "pkcs8", - "rand_core", + "rand_core 0.6.4", "sec1", "subtle", "zeroize", @@ -1185,14 +1185,13 @@ dependencies = [ [[package]] name = "fast_pool" -version = "0.2.1" +version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b98127359a96b4c7f1cb11005af68dbf7396b3ce7e50b3df02807c505ff7d73e" +checksum = "60e5e31750b1cab303073d061a99a88c02fb28b6aaf4d07037c3a0c8fb6cb300" dependencies = [ "async-trait", "flume", "futures-core", - "num_cpus", "tokio", ] @@ -1254,7 +1253,7 @@ dependencies = [ "opentelemetry_sdk", "paste", "prost-types", - "rand", + "rand 0.8.5", "rayon", "rbatis", "rbdc-mssql", @@ -1332,7 +1331,7 @@ version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ded41244b729663b1e574f1b4fb731469f69f79c17667b5d776b16cda0479449" dependencies = [ - "rand_core", + "rand_core 0.6.4", "subtle", ] @@ -1519,10 +1518,22 @@ dependencies = [ "cfg-if", "js-sys", "libc", - "wasi", + "wasi 0.11.0+wasi-snapshot-preview1", "wasm-bindgen", ] +[[package]] +name = "getrandom" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26145e563e54f2cadc477553f1ec5ee650b00862f0a58bcd12cbdc5f0ea2d2f4" +dependencies = [ + "cfg-if", + "libc", + "r-efi", + "wasi 0.14.7+wasi-0.2.4", +] + [[package]] name = "getset" version = "0.1.3" @@ -1554,7 +1565,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f0f9ef7462f7c099f518d754361858f86d8a07af53ba9af0fe635bbccb151a63" dependencies = [ "ff", - "rand_core", + "rand_core 0.6.4", "subtle", ] @@ -1690,12 +1701,6 @@ version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" -[[package]] -name = "hermit-abi" -version = "0.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024" - [[package]] name = "hermit-abi" version = "0.4.0" @@ -2162,7 +2167,7 @@ version = "0.4.13" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "261f68e344040fbd0edea105bef17c66edf46f984ddb1115b775ce31be948f4b" dependencies = [ - "hermit-abi 0.4.0", + "hermit-abi", "libc", "windows-sys 0.52.0", ] @@ -2307,9 +2312,9 @@ checksum = "04cbf5b083de1c7e0222a7a51dbfdba1cbe1c6ab0b15e29fff3f6c077fd9cd9f" [[package]] name = "lru" -version = "0.12.5" +version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "234cf4f4a04dc1f57e24b96cc0cd600cf2af460d4161ac5ecdd0af8e1f3b2a38" +checksum = "9f8cc7106155f10bdf99a6f379688f543ad6596a415375b36a59a054ceda1198" dependencies = [ "hashbrown 0.15.2", ] @@ -2367,7 +2372,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2886843bf800fba2e3377cff24abf6379b4c4d5c6681eaf9ea5b0d15090450bd" dependencies = [ "libc", - "wasi", + "wasi 0.11.0+wasi-snapshot-preview1", "windows-sys 0.52.0", ] @@ -2383,7 +2388,7 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3ffa00dec017b5b1a8b7cf5e2c008bfda1aa7e0697ac1508b491fdf2622fb4d8" dependencies = [ - "rand", + "rand 0.8.5", ] [[package]] @@ -2435,7 +2440,7 @@ dependencies = [ "num-integer", "num-iter", "num-traits", - "rand", + "rand 0.8.5", "smallvec", "zeroize", ] @@ -2476,16 +2481,6 @@ dependencies = [ "libm", ] -[[package]] -name = "num_cpus" -version = "1.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" -dependencies = [ - "hermit-abi 0.3.9", - "libc", -] - [[package]] name = "oauth2" version = "4.4.2" @@ -2494,9 +2489,9 @@ checksum = "c38841cdd844847e3e7c8d29cef9dcfed8877f8f56f9071f77843ecf3baf937f" dependencies = [ "base64 0.13.1", "chrono", - "getrandom", + "getrandom 0.2.15", "http 0.2.12", - "rand", + "rand 0.8.5", "reqwest 0.11.27", "serde", "serde_json", @@ -2544,7 +2539,7 @@ dependencies = [ "oauth2", "p256", "p384", - "rand", + "rand 0.8.5", "rsa", "serde", "serde-value", @@ -2689,7 +2684,7 @@ dependencies = [ "once_cell", "opentelemetry", "percent-encoding", - "rand", + "rand 0.8.5", "serde_json", "thiserror 1.0.69", "tokio", @@ -3128,8 +3123,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a2fe5ef3495d7d2e377ff17b1a8ce2ee2ec2a18cde8b6ad6619d65d0701c135d" dependencies = [ "bytes", - "getrandom", - "rand", + "getrandom 0.2.15", + "rand 0.8.5", "ring", "rustc-hash", "rustls 0.23.21", @@ -3164,6 +3159,12 @@ dependencies = [ "proc-macro2", ] +[[package]] +name = "r-efi" +version = "5.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "69cdb34c158ceb288df11e18b4bd39de994f6657d83847bdffdbd7f346754b0f" + [[package]] name = "r2d2" version = "0.8.10" @@ -3188,8 +3189,18 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" dependencies = [ "libc", - "rand_chacha", - "rand_core", + "rand_chacha 0.3.1", + "rand_core 0.6.4", +] + +[[package]] +name = "rand" +version = "0.9.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6db2770f06117d490610c7488547d543617b21bfa07796d7a12f6f1bd53850d1" +dependencies = [ + "rand_chacha 0.9.0", + "rand_core 0.9.3", ] [[package]] @@ -3199,7 +3210,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" dependencies = [ "ppv-lite86", - "rand_core", + "rand_core 0.6.4", +] + +[[package]] +name = "rand_chacha" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3022b5f1df60f26e1ffddd6c66e8aa15de382ae63b3a0c1bfc0e4d3e3f325cb" +dependencies = [ + "ppv-lite86", + "rand_core 0.9.3", ] [[package]] @@ -3208,7 +3229,16 @@ version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" dependencies = [ - "getrandom", + "getrandom 0.2.15", +] + +[[package]] +name = "rand_core" +version = "0.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "99d9a13982dcf210057a8a78572b2217b667c3beacbf3a0d8b454f6f82837d38" +dependencies = [ + "getrandom 0.3.3", ] [[package]] @@ -3233,9 +3263,9 @@ dependencies = [ [[package]] name = "rbatis" -version = "4.5.33" +version = "4.6.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7d7d3437c2e146237e1b4f592e152f6f8c9e47180fcb4e83ec7f6ed3b6cfc6d" +checksum = "f764fcf45197797401faf067f797b87186086eafc5c01be01ec5808906c2c791" dependencies = [ "async-trait", "dark-std", @@ -3244,7 +3274,7 @@ dependencies = [ "hex", "log", "parking_lot", - "rand", + "rand 0.9.2", "rbatis-codegen", "rbatis-macro-driver", "rbdc", @@ -3255,28 +3285,26 @@ dependencies = [ [[package]] name = "rbatis-codegen" -version = "4.5.29" +version = "4.6.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a320c99a3c0310984a2e522902e59f5f09cb6e24401f2c3a976d84bb7157709d" +checksum = "3933ecae4c5858884f65d51a23b381591ea4680ca9437235628d721e4ef9743e" dependencies = [ - "async-trait", - "base64 0.22.1", "html_parser", "proc-macro2", "quote", "rbs", "serde", - "serde_json", "syn 2.0.96", "url", ] [[package]] name = "rbatis-macro-driver" -version = "4.5.13" +version = "4.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "126dd56d43f7302348d9eb0e801b7dfdc490a60872327d16d1d3b63b343e9427" +checksum = "8de1009344065e1ae5ad2b8a1499a32cb185881121f5e47062c21e6706af5c44" dependencies = [ + "dark-std", "proc-macro2", "quote", "rbatis-codegen", @@ -3285,9 +3313,9 @@ dependencies = [ [[package]] name = "rbdc" -version = "4.5.45" +version = "4.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dae66bab36d8040f4fc5a3335f8dc40c9e10c95e228d024d3435f6a2cf4914aa" +checksum = "d4406cf8cf2fff0d2d9b4c0d9d9a4c19071024f7fcf1246ed6ed1b2fb7edd871" dependencies = [ "async-trait", "bigdecimal 0.4.7", @@ -3352,7 +3380,7 @@ dependencies = [ "hex", "log", "percent-encoding", - "rand", + "rand 0.8.5", "rbdc", "rbs", "rsa", @@ -3388,7 +3416,7 @@ dependencies = [ "memchr", "num-bigint", "percent-encoding", - "rand", + "rand 0.8.5", "rbdc", "rbs", "serde", @@ -3403,9 +3431,9 @@ dependencies = [ [[package]] name = "rbdc-pool-fast" -version = "4.5.11" +version = "4.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02b249a49f28703a3139083e1fab38ba0890e5331f8a68fdf3bab36775ceff91" +checksum = "9b604919949e5c58be5029cb6d8f2deae133c1f9bacb21390aa1c2399169d2e0" dependencies = [ "async-trait", "dark-std", @@ -3418,9 +3446,9 @@ dependencies = [ [[package]] name = "rbs" -version = "4.5.25" +version = "4.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e21891a5800f097efbd3fc05a3836ce99a8121d2c75f3a2750d884a32b330e3b" +checksum = "8fce90100e809c1438979030f69c4d37969cb22b0ddd59901418feb0aee54bde" dependencies = [ "indexmap 2.7.0", "serde", @@ -3441,7 +3469,7 @@ version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ba009ff324d1fc1b900bd1fdb31564febe58a8ccc8a6fdbb93b543d33b13ca43" dependencies = [ - "getrandom", + "getrandom 0.2.15", "libredox", "thiserror 1.0.69", ] @@ -3602,7 +3630,7 @@ checksum = "c17fa4cb658e3583423e915b9f3acc01cceaee1860e33d59ebae66adc3a2dc0d" dependencies = [ "cc", "cfg-if", - "getrandom", + "getrandom 0.2.15", "libc", "spin", "untrusted", @@ -3651,7 +3679,7 @@ dependencies = [ "num-traits", "pkcs1", "pkcs8", - "rand_core", + "rand_core 0.6.4", "signature", "spki", "subtle", @@ -3668,7 +3696,7 @@ dependencies = [ "borsh", "bytes", "num-traits", - "rand", + "rand 0.8.5", "rkyv", "serde", "serde_json", @@ -4082,7 +4110,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "77549399552de45a898a580c1b41d445bf730df867cc44e6c0233bbc4b8329de" dependencies = [ "digest", - "rand_core", + "rand_core 0.6.4", ] [[package]] @@ -4113,7 +4141,7 @@ dependencies = [ "itoa", "native-tls", "r2d2", - "rand", + "rand 0.8.5", "sky-derive", "tokio", "tokio-native-tls", @@ -4321,7 +4349,7 @@ checksum = "9a8a559c81686f576e8cd0290cd2a24a2a9ad80c98b3478856500fcbd7acd704" dependencies = [ "cfg-if", "fastrand", - "getrandom", + "getrandom 0.2.15", "once_cell", "rustix", "windows-sys 0.59.0", @@ -4541,7 +4569,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7f57eb36ecbe0fc510036adff84824dd3c24bb781e21bfa67b69d556aa85214f" dependencies = [ "pin-project", - "rand", + "rand 0.8.5", "tokio", ] @@ -4708,7 +4736,7 @@ dependencies = [ "indexmap 1.9.3", "pin-project", "pin-project-lite", - "rand", + "rand 0.8.5", "slab", "tokio", "tokio-util", @@ -5008,7 +5036,7 @@ version = "1.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b913a3b5fe84142e269d63cc62b64319ccaf89b748fc31fe025177f767a756c4" dependencies = [ - "getrandom", + "getrandom 0.2.15", ] [[package]] @@ -5106,6 +5134,24 @@ version = "0.11.0+wasi-snapshot-preview1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" +[[package]] +name = "wasi" +version = "0.14.7+wasi-0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "883478de20367e224c0090af9cf5f9fa85bed63a95c1abf3afc5c083ebc06e8c" +dependencies = [ + "wasip2", +] + +[[package]] +name = "wasip2" +version = "1.0.1+wasi-0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0562428422c63773dad2c345a1882263bbf4d65cf3f42e90921f787ef5ad58e7" +dependencies = [ + "wit-bindgen", +] + [[package]] name = "wasite" version = "0.1.0" @@ -5269,7 +5315,7 @@ version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb" dependencies = [ - "windows-sys 0.48.0", + "windows-sys 0.59.0", ] [[package]] @@ -5498,6 +5544,12 @@ dependencies = [ "windows-sys 0.48.0", ] +[[package]] +name = "wit-bindgen" +version = "0.46.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f17a85883d4e6d00e8a97c586de764dabcc06133f7f1d55dce5cdc070ad7fe59" + [[package]] name = "write16" version = "1.0.0" diff --git a/Cargo.toml b/Cargo.toml index 633eca5c..d7c79dad 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -43,7 +43,7 @@ opentelemetry-semantic-conventions = { version = "0.16.0", optional = true } opentelemetry-http = { version = "0.13.0", optional = true } paste = "1.0.14" prost-types = "0.13.0" -rbatis = "=4.5.33" +rbatis = "=4.6.12" rayon = "1.10.0" rbdc-pg = { version = "4.5.17", optional = true } rbdc-mysql = { version = "4.5.17", optional = true }