From 1d6c12e777e8dca049b79183109045d8d0611754 Mon Sep 17 00:00:00 2001 From: Tobie Morgan Hitchcock Date: Sat, 15 Jul 2023 13:18:44 +0100 Subject: [PATCH] Update dependencies and reduce log traces (#2265) --- Cargo.lock | 179 ++++++++++++++++++---------------- Cargo.toml | 10 +- lib/Cargo.toml | 18 ++-- lib/examples/actix/Cargo.toml | 4 +- lib/examples/axum/Cargo.toml | 4 +- lib/src/kvs/tests/helper.rs | 10 -- lib/src/sql/value/value.rs | 2 +- 7 files changed, 115 insertions(+), 112 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 576016fd..430562da 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -177,7 +177,7 @@ dependencies = [ "serde_urlencoded", "smallvec", "socket2", - "time 0.3.22", + "time 0.3.23", "url", ] @@ -372,12 +372,13 @@ checksum = "bddcadddf5e9015d310179a59bb28c4d4b9920ad0f11e8e14dbadf654890c9a6" [[package]] name = "argon2" -version = "0.5.0" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95c2fcf79ad1932ac6269a738109997a83c227c09b75842ae564dc8ede6a861c" +checksum = "b2e554a8638bdc1e4eae9984845306cc95f8a9208ba8d49c3859fd958b46774d" dependencies = [ "base64ct", "blake2", + "cpufeatures", "password-hash", ] @@ -404,9 +405,9 @@ dependencies = [ [[package]] name = "async-channel" -version = "1.8.0" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf46fee83e5ccffc220104713af3292ff9bc7c64c7de289f66dae8e38d826833" +checksum = "81953c529336010edd6d8e358f886d9581267795c61b19475b71314bffa46d35" dependencies = [ "concurrent-queue", "event-listener", @@ -458,7 +459,7 @@ checksum = "0e97ce7de6cf12de5d7226c73f5ba9811622f4db3a5b91b55c53e987e5f91cba" dependencies = [ "proc-macro2", "quote", - "syn 2.0.23", + "syn 2.0.26", ] [[package]] @@ -480,7 +481,7 @@ checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193" dependencies = [ "proc-macro2", "quote", - "syn 2.0.23", + "syn 2.0.26", ] [[package]] @@ -497,7 +498,7 @@ checksum = "7b2d0f03b3640e3a630367e40c468cb7f309529c708ed1d88597047b0e7c6ef7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.23", + "syn 2.0.26", ] [[package]] @@ -716,7 +717,7 @@ dependencies = [ "regex", "rustc-hash", "shlex 1.1.0", - "syn 2.0.23", + "syn 2.0.26", "which", ] @@ -1057,9 +1058,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.3.10" +version = "4.3.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "384e169cc618c613d5e3ca6404dda77a8685a63e08660dcc64abaf7da7cb0c7a" +checksum = "3eab9e8ceb9afdade1ab3f0fd8dbce5b1b2f468ad653baf10e771781b2b67b73" dependencies = [ "clap_builder", "clap_derive", @@ -1068,9 +1069,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.3.10" +version = "4.3.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef137bbe35aab78bdb468ccfba75a5f4d8321ae011d34063770780545176af2d" +checksum = "9f2763db829349bf00cfc06251268865ed4363b93a943174f638daf3ecdba2cd" dependencies = [ "anstream", "anstyle", @@ -1083,14 +1084,14 @@ dependencies = [ [[package]] name = "clap_derive" -version = "4.3.2" +version = "4.3.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8cd2b2a819ad6eec39e8f1d6b53001af1e5469f8c177579cdaeb313115b825f" +checksum = "54a9bb5758fc5dfe728d1019941681eccaf0cf8a4189b692a0ee2f2ecf90a050" dependencies = [ "heck 0.4.1", "proc-macro2", "quote", - "syn 2.0.23", + "syn 2.0.26", ] [[package]] @@ -1166,7 +1167,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e859cd57d0710d9e06c381b550c06e76992472a8c6d527aecd2fc673dcc231fb" dependencies = [ "percent-encoding", - "time 0.3.22", + "time 0.3.23", "version_check", ] @@ -1197,9 +1198,9 @@ dependencies = [ [[package]] name = "cpufeatures" -version = "0.2.8" +version = "0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03e69e28e9f7f77debdedbaafa2866e1de9ba56df55a8bd7cfc724c25a09987c" +checksum = "a17b76ff3a4162b0b27f354a0c87015ddad39d35f9c0c36607a3bdd175dde1f1" dependencies = [ "libc", ] @@ -1575,7 +1576,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ef033ed5e9bad94e55838ca0ca906db0e043f517adda0c8b79c7a8c66c93c1b5" dependencies = [ "cfg-if", - "rustix 0.38.2", + "rustix 0.38.4", "windows-sys 0.48.0", ] @@ -1699,7 +1700,7 @@ checksum = "83c8d52fe8b46ab822b4decdcc0d6d85aeedfc98f0d52ba2bd4aec4a97807516" dependencies = [ "proc-macro2", "quote", - "syn 2.0.23", + "syn 2.0.26", "try_map", ] @@ -1813,7 +1814,7 @@ checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" dependencies = [ "proc-macro2", "quote", - "syn 2.0.23", + "syn 2.0.26", ] [[package]] @@ -2137,9 +2138,9 @@ dependencies = [ [[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 = "hex" @@ -2412,7 +2413,7 @@ version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2" dependencies = [ - "hermit-abi 0.3.1", + "hermit-abi 0.3.2", "libc", "windows-sys 0.48.0", ] @@ -2425,12 +2426,12 @@ checksum = "28b29a3cd74f0f4598934efe3aeba42bae0eb4680554128851ebbecb02af14e6" [[package]] name = "is-terminal" -version = "0.4.8" +version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24fddda5af7e54bf7da53067d6e802dbcc381d0a8eef629df528e3ebf68755cb" +checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b" dependencies = [ - "hermit-abi 0.3.1", - "rustix 0.38.2", + "hermit-abi 0.3.2", + "rustix 0.38.4", "windows-sys 0.48.0", ] @@ -2454,9 +2455,9 @@ dependencies = [ [[package]] name = "itoa" -version = "1.0.7" +version = "1.0.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0aa48fab2893d8a49caa94082ae8488f4e1050d73b367881dcd2198f4199fd8" +checksum = "62b02a5381cc465bd3041d84623d0fa3b66738b52b8e2fc3bab8ad63ab032f4a" [[package]] name = "jobserver" @@ -2654,7 +2655,7 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558" dependencies = [ - "regex-automata", + "regex-automata 0.1.10", ] [[package]] @@ -2908,7 +2909,7 @@ version = "1.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" dependencies = [ - "hermit-abi 0.3.1", + "hermit-abi 0.3.2", "libc", ] @@ -2956,7 +2957,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.23", + "syn 2.0.26", ] [[package]] @@ -3152,9 +3153,9 @@ checksum = "9f746c4065a8fa3fe23974dd82f15431cc8d40779821001404d10d2e79ca7d79" [[package]] name = "pbkdf2" -version = "0.12.1" +version = "0.12.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0ca0b5a68607598bf3bad68f32227a8164f6254833f84eafaac409cd6746c31" +checksum = "f8ed6a7761f76e3b9f92dfb0a60a6a6477c61024b775147ff0973a02653abaf2" dependencies = [ "digest", "hmac", @@ -3230,7 +3231,7 @@ checksum = "ec2e072ecce94ec471b13398d5402c188e76ac03cf74dd1a975161b23a3f6d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.23", + "syn 2.0.26", ] [[package]] @@ -3352,7 +3353,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9825a04601d60621feed79c4e6b56d65db77cdca55cef43b46b0de1096d1c282" dependencies = [ "proc-macro2", - "syn 2.0.23", + "syn 2.0.26", ] [[package]] @@ -3400,9 +3401,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.63" +version = "1.0.64" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b368fba921b0dce7e60f5e04ec15e565b3303972b42bcfde1d0713b881959eb" +checksum = "78803b62cbf1f46fde80d7c0e803111524b9877184cfe7c3033659490ac7a7da" dependencies = [ "unicode-ident", ] @@ -3735,7 +3736,7 @@ checksum = "ffbe84efe2f38dea12e9bfc1f65377fdf03e53a18cb3b995faedf7934c7e785b" dependencies = [ "pem", "ring", - "time 0.3.22", + "time 0.3.23", "yasna", ] @@ -3770,13 +3771,14 @@ dependencies = [ [[package]] name = "regex" -version = "1.8.4" +version = "1.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0ab3ca65655bb1e41f2a8c8cd662eb4fb035e67c3f78da1d61dffe89d07300f" +checksum = "b2eae68fc220f7cf2532e4494aded17545fce192d59cd996e0fe7887f4ceb575" dependencies = [ "aho-corasick 1.0.2", "memchr", - "regex-syntax 0.7.2", + "regex-automata 0.3.3", + "regex-syntax 0.7.4", ] [[package]] @@ -3788,6 +3790,17 @@ dependencies = [ "regex-syntax 0.6.29", ] +[[package]] +name = "regex-automata" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "39354c10dd07468c2e73926b23bb9c2caca74c5501e38a35da70406f1d923310" +dependencies = [ + "aho-corasick 1.0.2", + "memchr", + "regex-syntax 0.7.4", +] + [[package]] name = "regex-syntax" version = "0.6.29" @@ -3796,9 +3809,9 @@ checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" [[package]] name = "regex-syntax" -version = "0.7.2" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "436b050e76ed2903236f032a59761c1eb99e1b0aead2c257922771dab1fc8c78" +checksum = "e5ea92a5b6195c6ef2a0295ea818b312502c6fc94dde986c5553242e18fd4ce2" [[package]] name = "relative-path" @@ -4094,9 +4107,9 @@ dependencies = [ [[package]] name = "rustix" -version = "0.37.22" +version = "0.37.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8818fa822adcc98b18fedbb3632a6a33213c070556b5aa7c4c8cc21cff565c4c" +checksum = "4d69718bf81c6127a49dc64e44a742e8bb9213c0ff8869a22c308f84c1d4ab06" dependencies = [ "bitflags 1.3.2", "errno", @@ -4108,9 +4121,9 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.2" +version = "0.38.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aabcb0461ebd01d6b79945797c27f8529082226cb630a9865a71870ff63532a4" +checksum = "0a962918ea88d644592894bc6dc55acc6c0956488adcebbfb6e273506b7fd6e5" dependencies = [ "bitflags 2.3.3", "errno", @@ -4205,9 +4218,9 @@ dependencies = [ [[package]] name = "ryu" -version = "1.0.13" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f91339c0467de62360649f8d3e185ca8de4224ff281f66000de5eb2a77a79041" +checksum = "fe232bdf6be8c8de797b22184ee71118d63780ea42ac85b61d1baa6d3b782ae9" [[package]] name = "salsa20" @@ -4316,9 +4329,9 @@ checksum = "cd0b0ec5f1c1ca621c432a25813d8d60c88abe6d3e08a3eb9cf37d97a0fe3d73" [[package]] name = "serde" -version = "1.0.164" +version = "1.0.171" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e8c8cf938e98f769bc164923b06dce91cea1751522f46f8466461af04c9027d" +checksum = "30e27d1e4fd7659406c492fd6cfaf2066ba8773de45ca75e855590f856dc34a9" dependencies = [ "serde_derive", ] @@ -4344,20 +4357,20 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.164" +version = "1.0.171" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9735b638ccc51c28bf6914d90a2e9725b377144fc612c49a611fddd1b631d68" +checksum = "389894603bd18c46fa56231694f8d827779c0951a667087194cf9de94ed24682" dependencies = [ "proc-macro2", "quote", - "syn 2.0.23", + "syn 2.0.26", ] [[package]] name = "serde_json" -version = "1.0.99" +version = "1.0.102" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46266871c240a00b8f503b877622fe33430b3c7d963bdc0f2adc511e54a1eae3" +checksum = "b5062a995d481b2308b6064e9af76011f2921c35f97b0468811ed9f6cd91dfed" dependencies = [ "itoa", "ryu", @@ -4408,7 +4421,7 @@ checksum = "91d129178576168c589c9ec973feedf7d3126c01ac2bf08795109aa35b69fb8f" dependencies = [ "proc-macro2", "quote", - "syn 2.0.23", + "syn 2.0.26", ] [[package]] @@ -4489,7 +4502,7 @@ dependencies = [ "num-bigint", "num-traits", "thiserror", - "time 0.3.22", + "time 0.3.23", ] [[package]] @@ -4604,7 +4617,7 @@ dependencies = [ "assert_fs", "base64 0.21.2", "bytes", - "clap 4.3.10", + "clap 4.3.12", "futures 0.3.28", "glob", "http", @@ -4708,7 +4721,7 @@ dependencies = [ "temp-dir", "test-log", "thiserror", - "time 0.3.22", + "time 0.3.23", "tokio", "tokio-tungstenite", "tokio-util", @@ -4855,9 +4868,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.23" +version = "2.0.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59fb7d6d8281a51045d62b8eb3a7d1ce347b76f312af50cd3dc0af39c87c1737" +checksum = "45c3457aacde3c65315de5031ec191ce46604304d2446e803d71ade03308d970" dependencies = [ "proc-macro2", "quote", @@ -4901,7 +4914,7 @@ dependencies = [ "cfg-if", "fastrand", "redox_syscall 0.3.5", - "rustix 0.37.22", + "rustix 0.37.23", "windows-sys 0.48.0", ] @@ -4920,7 +4933,7 @@ version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8e6bf6f19e9f8ed8d4048dc22981458ebcf406d67e94cd422e5ecd73d63b3237" dependencies = [ - "rustix 0.37.22", + "rustix 0.37.23", "windows-sys 0.48.0", ] @@ -4949,22 +4962,22 @@ checksum = "222a222a5bfe1bba4a77b45ec488a741b3cb8872e5e499451fd7d0129c9c7c3d" [[package]] name = "thiserror" -version = "1.0.40" +version = "1.0.43" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "978c9a314bd8dc99be594bc3c175faaa9794be04a5a5e153caba6915336cebac" +checksum = "a35fc5b8971143ca348fa6df4f024d4d55264f3468c71ad1c2f365b0a4d58c42" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.40" +version = "1.0.43" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f" +checksum = "463fe12d7993d3b327787537ce8dd4dfa058de32fc2b195ef3cde03dc4771e8f" dependencies = [ "proc-macro2", "quote", - "syn 2.0.23", + "syn 2.0.26", ] [[package]] @@ -4990,9 +5003,9 @@ dependencies = [ [[package]] name = "time" -version = "0.3.22" +version = "0.3.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea9e1b3cf1243ae005d9e74085d4d542f3125458f3a81af210d901dcd7411efd" +checksum = "59e399c068f43a5d116fedaf73b203fa4f9c519f17e2b34f63221d3792f81446" dependencies = [ "itoa", "serde", @@ -5008,9 +5021,9 @@ checksum = "7300fbefb4dadc1af235a9cef3737cea692a9d97e1b9cbcd4ebdae6f8868e6fb" [[package]] name = "time-macros" -version = "0.2.9" +version = "0.2.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "372950940a5f07bf38dbe211d7283c9e6d7327df53794992d293e534c733d09b" +checksum = "96ba15a897f3c86766b757e5ac7221554c6750054d74d5b28844fce5fb36a6c4" dependencies = [ "time-core", ] @@ -5078,7 +5091,7 @@ checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.23", + "syn 2.0.26", ] [[package]] @@ -5280,7 +5293,7 @@ checksum = "5f4f31f56159e98206da9efd823404b79b6ef3143b4a7ab76e67b1751b25a4ab" dependencies = [ "proc-macro2", "quote", - "syn 2.0.23", + "syn 2.0.26", ] [[package]] @@ -5424,9 +5437,9 @@ checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" [[package]] name = "unicode-ident" -version = "1.0.9" +version = "1.0.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b15811caf2415fb889178633e7724bad2509101cde276048e013b9def5e51fa0" +checksum = "22049a19f4a68748a168c0fc439f9516686aa045927ff767eca0a85101fb6e73" [[package]] name = "unicode-normalization" @@ -5613,7 +5626,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.23", + "syn 2.0.26", "wasm-bindgen-shared", ] @@ -5647,7 +5660,7 @@ checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.23", + "syn 2.0.26", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -5945,7 +5958,7 @@ version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e17bb3549cc1321ae1296b9cdc2698e2b6cb1992adfa19a8c72e5b7a738f44cd" dependencies = [ - "time 0.3.22", + "time 0.3.23", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index c69744d6..d7276a41 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -33,10 +33,10 @@ codegen-units = 1 strip = false [dependencies] -argon2 = "0.5.0" +argon2 = "0.5.1" base64 = "0.21.2" bytes = "1.4.0" -clap = { version = "4.3.10", features = ["env", "derive", "wrap_help", "unicode"] } +clap = { version = "4.3.12", features = ["env", "derive", "wrap_help", "unicode"] } futures = "0.3.28" glob = "0.3.1" http = "0.2.9" @@ -48,13 +48,13 @@ opentelemetry-otlp = "0.11.0" rand = "0.8.5" reqwest = { version = "0.11.18", features = ["blocking"] } rustyline = { version = "11.0.0", features = ["derive"] } -serde = { version = "1.0.164", features = ["derive"] } +serde = { version = "1.0.171", features = ["derive"] } serde_cbor = "0.11.2" -serde_json = "1.0.99" +serde_json = "1.0.102" serde_pack = { version = "1.1.1", package = "rmp-serde" } surrealdb = { path = "lib", features = ["protocol-http", "protocol-ws", "rustls"] } tempfile = "3.6.0" -thiserror = "1.0.40" +thiserror = "1.0.43" tokio = { version = "1.29.1", features = ["macros", "signal"] } tokio-util = { version = "0.7.8", features = ["io"] } tracing = "0.1" diff --git a/lib/Cargo.toml b/lib/Cargo.toml index 602fd09f..02f5089c 100644 --- a/lib/Cargo.toml +++ b/lib/Cargo.toml @@ -52,14 +52,14 @@ targets = [] [dependencies] addr = { version = "0.15.6", default-features = false, features = ["std"] } -argon2 = "0.5.0" +argon2 = "0.5.1" ascii = { version = "0.3.2", package = "any_ascii" } async-recursion = "1.0.4" base64_lib = { version = "0.21.2", package = "base64" } bcrypt = "0.14.0" bincode = "1.3.3" bung = "0.1.0" -channel = { version = "1.8.0", package = "async-channel" } +channel = { version = "1.9.0", package = "async-channel" } chrono = { version = "0.4.26", features = ["serde"] } derive = { version = "0.9.0", package = "surrealdb-derive" } deunicode = "1.3.3" @@ -84,11 +84,11 @@ nanoid = "0.4.0" native-tls = { version = "0.2.11", optional = true } nom = { version = "7.1.3", features = ["alloc"] } once_cell = "1.18.0" -pbkdf2 = { version = "0.12.1", features = ["simple"] } +pbkdf2 = { version = "0.12.2", features = ["simple"] } pin-project-lite = "0.2.10" radix_trie = { version = "0.2.1", features = ["serde"] } rand = "0.8.5" -regex = "1.8.4" +regex = "1.9.1" reqwest = { version = "0.11.18", default-features = false, features = ["json", "stream","multipart"], optional = true } roaring = { version = "0.10.1", features = ["serde"] } rocksdb = { version = "0.21.0", optional = true } @@ -98,13 +98,13 @@ rustls = { version = "0.20.8", optional = true } snap = "1.1.0" scrypt = "0.11.0" semver = { version = "1.0.17", features = ["serde"] } -serde = { version = "1.0.164", features = ["derive"] } -serde_json = "1.0.99" +serde = { version = "1.0.171", features = ["derive"] } +serde_json = "1.0.102" sha-1 = "0.10.1" sha2 = "0.10.7" speedb = { version = "0.0.2", optional = true } storekey = "0.5.0" -thiserror = "1.0.40" +thiserror = "1.0.43" tikv = { version = "0.1.0-surreal.1", package = "surrealdb-tikv-client", optional = true } tikv-client-proto = { version = "0.1.0-surreal.1", package = "surrealdb-tikv-client-proto", optional = true } tokio-util = { version = "0.7.8", optional = true, features = ["compat"] } @@ -121,7 +121,7 @@ test-log = "0.2.12" pprof = { version = "0.11.1", features = [ "flamegraph", "criterion" ] } serial_test = "2.0.0" temp-dir = "0.1.11" -time = { version = "0.3.22", features = ["serde"] } +time = { version = "0.3.23", features = ["serde"] } tokio = { version = "1.29.1", features = ["macros", "sync", "rt-multi-thread"] } tracing-subscriber = { version = "0.3.17", features = ["env-filter"] } @@ -155,4 +155,4 @@ harness = false [[bench]] name = "index_btree" -harness = false \ No newline at end of file +harness = false diff --git a/lib/examples/actix/Cargo.toml b/lib/examples/actix/Cargo.toml index e5a55bb7..2dcb8e78 100644 --- a/lib/examples/actix/Cargo.toml +++ b/lib/examples/actix/Cargo.toml @@ -6,6 +6,6 @@ publish = false [dependencies] actix-web = { version = "4.3.1", features = ["macros"] } -serde = { version = "1.0.164", features = ["derive"] } +serde = { version = "1.0.171", features = ["derive"] } surrealdb = { path = "../.." } -thiserror = "1.0.40" +thiserror = "1.0.43" diff --git a/lib/examples/axum/Cargo.toml b/lib/examples/axum/Cargo.toml index 3d5aede7..6b49c834 100644 --- a/lib/examples/axum/Cargo.toml +++ b/lib/examples/axum/Cargo.toml @@ -6,7 +6,7 @@ publish = false [dependencies] axum = "0.6.18" -serde = { version = "1.0.164", features = ["derive"] } +serde = { version = "1.0.171", features = ["derive"] } surrealdb = { path = "../.." } -thiserror = "1.0.40" +thiserror = "1.0.43" tokio = { version = "1.29.1", features = ["macros", "rt-multi-thread"] } diff --git a/lib/src/kvs/tests/helper.rs b/lib/src/kvs/tests/helper.rs index 83aa4be8..0fa902c1 100644 --- a/lib/src/kvs/tests/helper.rs +++ b/lib/src/kvs/tests/helper.rs @@ -1,8 +1,5 @@ use crate::dbs::cl::Timestamp; use crate::err::Error; -use std::sync::Once; -use tracing::Level; -use tracing_subscriber; pub struct TestContext { pub(crate) db: Datastore, @@ -12,8 +9,6 @@ pub struct TestContext { pub(crate) context_id: String, } -static INIT: Once = Once::new(); - /// TestContext is a container for an initialised test context /// Anything stateful (such as storage layer and logging) can be tied with this impl TestContext { @@ -39,11 +34,6 @@ impl TestContext { /// Initialise logging and prepare a useable datastore /// In the future it would be nice to handle multiple datastores pub(crate) async fn init() -> Result { - // Set tracing for tests for debug, but only do it once - INIT.call_once(|| { - let _subscriber = tracing_subscriber::fmt().with_max_level(Level::TRACE).try_init(); - }); - let db = new_ds().await; return Ok(TestContext { db, diff --git a/lib/src/sql/value/value.rs b/lib/src/sql/value/value.rs index 55aa2e68..aa5d08b2 100644 --- a/lib/src/sql/value/value.rs +++ b/lib/src/sql/value/value.rs @@ -2934,7 +2934,7 @@ mod tests { assert_eq!(24, std::mem::size_of::()); assert_eq!(56, std::mem::size_of::()); assert_eq!(40, std::mem::size_of::()); - assert_eq!(16, std::mem::size_of::()); + assert_eq!(32, std::mem::size_of::()); assert_eq!(8, std::mem::size_of::>()); assert_eq!(8, std::mem::size_of::>()); assert_eq!(8, std::mem::size_of::>());