noth/surrealpatch
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update 3rd party dependencies

Browse source
This commit is contained in:
Tobie Morgan Hitchcock 2023-03-25 20:49:00 +00:00
parent 715b79c24e
commit 2769033451
9 changed files with 196 additions and 200 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

276
Cargo.lock generated
View file

@ -2,17 +2,6 @@
# It is not intended for manual editing. # It is not intended for manual editing.
version = 3 version = 3
[[package]]
name = "accurate"
version = "0.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4f209f0bc218ee6cf50db56ec0d9fe10b3cbfb6f3900d019b36c8fdb6d3bc03e"
dependencies = [
"cfg-if",
"ieee754",
"num-traits",
]
[[package]] [[package]]
name = "actix-codec" name = "actix-codec"
version = "0.5.0" version = "0.5.0"
@ -86,7 +75,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "465a6172cf69b960917811022d8f29bc0b7fa1398bc4f78b3c466673db1213b6" checksum = "465a6172cf69b960917811022d8f29bc0b7fa1398bc4f78b3c466673db1213b6"
dependencies = [ dependencies = [
"quote", "quote",
"syn", "syn 1.0.109",
] ]
[[package]] [[package]]
@ -201,7 +190,7 @@ dependencies = [
"actix-router", "actix-router",
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn", "syn 1.0.109",
] ]
[[package]] [[package]]
@ -283,9 +272,9 @@ checksum = "70033777eb8b5124a81a1889416543dddef2de240019b674c81285a2635a7e1e"
[[package]] [[package]]
name = "anyhow" name = "anyhow"
version = "1.0.69" version = "1.0.70"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "224afbd727c3d6e4b90103ece64b8d1b67fbb1973b1046c2281eed3f3803f800" checksum = "7de8ce5e0f9f8d88245311066a578d72b7af3e7088f32783804676302df237e4"
[[package]] [[package]]
name = "approx" name = "approx"
@ -304,9 +293,9 @@ checksum = "bddcadddf5e9015d310179a59bb28c4d4b9920ad0f11e8e14dbadf654890c9a6"
[[package]] [[package]]
name = "argon2" name = "argon2"
version = "0.4.1" version = "0.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "db4ce4441f99dbd377ca8a8f57b698c44d0d6e712d8329b5040da5a64aa1ce73" checksum = "95c2fcf79ad1932ac6269a738109997a83c227c09b75842ae564dc8ede6a861c"
dependencies = [ dependencies = [
"base64ct", "base64ct",
"blake2", "blake2",
@ -363,30 +352,30 @@ dependencies = [
[[package]] [[package]]
name = "async-recursion" name = "async-recursion"
version = "1.0.2" version = "1.0.4"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3b015a331cc64ebd1774ba119538573603427eaace0a1950c423ab971f903796" checksum = "0e97ce7de6cf12de5d7226c73f5ba9811622f4db3a5b91b55c53e987e5f91cba"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn", "syn 2.0.10",
] ]
[[package]] [[package]]
name = "async-task" name = "async-task"
version = "4.3.0" version = "4.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7a40729d2133846d9ed0ea60a8b9541bccddab49cd30f0715a1da672fe9a2524" checksum = "ecc7ab41815b3c653ccd2978ec3255c81349336702dfdf62ee6f7069b12a3aae"
[[package]] [[package]]
name = "async-trait" name = "async-trait"
version = "0.1.66" version = "0.1.68"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b84f9ebcc6c1f5b8cb160f6990096a5c127f423fcb6e1ccc46c370cbdfb75dfc" checksum = "b9ccdd8f2a161be9bd5c023df56f1b2a0bd1d83872ae53b71a84a12c9bf6e842"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn", "syn 2.0.10",
] ]
[[package]] [[package]]
@ -437,9 +426,9 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
[[package]] [[package]]
name = "axum" name = "axum"
version = "0.6.11" version = "0.6.12"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "13d8068b6ccb8b34db9de397c7043f91db8b4c66414952c6db944f238c4d3db3" checksum = "349f8ccfd9221ee7d1f3d4b33e1f8319b3a81ed8f61f2ea40b37b859794b4491"
dependencies = [ dependencies = [
"async-trait", "async-trait",
"axum-core", "axum-core",
@ -598,7 +587,7 @@ dependencies = [
"regex", "regex",
"rustc-hash", "rustc-hash",
"shlex 1.1.0", "shlex 1.1.0",
"syn", "syn 1.0.109",
] ]
[[package]] [[package]]
@ -923,9 +912,9 @@ checksum = "5827cebf4670468b8772dd191856768aedcb1b0278a04f989f7766351917b9dc"
[[package]] [[package]]
name = "cpufeatures" name = "cpufeatures"
version = "0.2.5" version = "0.2.6"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "28d997bd5e24a5928dd43e46dc529867e207907fe0b239c3477d924f7f2ca320" checksum = "280a9f2d8b3a38871a3c8a46fb80db65e5e5ed97da80c4d08bf27fb63e35e181"
dependencies = [ dependencies = [
"libc", "libc",
] ]
@ -966,9 +955,9 @@ dependencies = [
[[package]] [[package]]
name = "cxx" name = "cxx"
version = "1.0.92" version = "1.0.93"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9a140f260e6f3f79013b8bfc65e7ce630c9ab4388c6a89c71e07226f49487b72" checksum = "a9c00419335c41018365ddf7e4d5f1c12ee3659ddcf3e01974650ba1de73d038"
dependencies = [ dependencies = [
"cc", "cc",
"cxxbridge-flags", "cxxbridge-flags",
@ -978,9 +967,9 @@ dependencies = [
[[package]] [[package]]
name = "cxx-build" name = "cxx-build"
version = "1.0.92" version = "1.0.93"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "da6383f459341ea689374bf0a42979739dc421874f112ff26f829b8040b8e613" checksum = "fb8307ad413a98fff033c8545ecf133e3257747b3bae935e7602aab8aa92d4ca"
dependencies = [ dependencies = [
"cc", "cc",
"codespan-reporting", "codespan-reporting",
@ -988,24 +977,24 @@ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
"scratch", "scratch",
"syn", "syn 2.0.10",
] ]
[[package]] [[package]]
name = "cxxbridge-flags" name = "cxxbridge-flags"
version = "1.0.92" version = "1.0.93"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "90201c1a650e95ccff1c8c0bb5a343213bdd317c6e600a93075bca2eff54ec97" checksum = "edc52e2eb08915cb12596d29d55f0b5384f00d697a646dbd269b6ecb0fbd9d31"
[[package]] [[package]]
name = "cxxbridge-macro" name = "cxxbridge-macro"
version = "1.0.92" version = "1.0.93"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0b75aed41bb2e6367cae39e6326ef817a851db13c13e4f3263714ca3cfb8de56" checksum = "631569015d0d8d54e6c241733f944042623ab6df7bc3be7466874b05fcdb1c5f"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn", "syn 2.0.10",
] ]
[[package]] [[package]]
@ -1029,7 +1018,7 @@ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
"strsim", "strsim",
"syn", "syn 1.0.109",
] ]
[[package]] [[package]]
@ -1040,7 +1029,7 @@ checksum = "a4aab4dbc9f7611d8b55048a3a16d2d010c2c8334e46304b40ac1cc14bf3b48e"
dependencies = [ dependencies = [
"darling_core", "darling_core",
"quote", "quote",
"syn", "syn 1.0.109",
] ]
[[package]] [[package]]
@ -1051,7 +1040,7 @@ checksum = "3418329ca0ad70234b9735dc4ceed10af4df60eff9c8e7b06cb5e520d92c3535"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn", "syn 1.0.109",
] ]
[[package]] [[package]]
@ -1064,7 +1053,7 @@ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
"rustc_version", "rustc_version",
"syn", "syn 1.0.109",
] ]
[[package]] [[package]]
@ -1244,9 +1233,9 @@ dependencies = [
[[package]] [[package]]
name = "fern" name = "fern"
version = "0.6.1" version = "0.6.2"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3bdd7b0849075e79ee9a1836df22c717d1eba30451796fdc631b04565dd11e2a" checksum = "d9f0c14694cbd524c8720dd69b0e3179344f04ebb5f90f2e4a440c6ea3b2f1ee"
dependencies = [ dependencies = [
"colored", "colored",
"log", "log",
@ -1276,12 +1265,9 @@ dependencies = [
[[package]] [[package]]
name = "float_next_after" name = "float_next_after"
version = "0.1.5" version = "1.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4fc612c5837986b7104a87a0df74a5460931f1c5274be12f8d0f40aa2f30d632" checksum = "8bf7cc16383c4b8d58b9905a8509f02926ce3058053c056376248d958c9df1e8"
dependencies = [
"num-traits",
]
[[package]] [[package]]
name = "flume" name = "flume"
@ -1359,7 +1345,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2163c7326208be8edc605e10303ec6ae45cf106c12540754a9970bcce0f80cae" checksum = "2163c7326208be8edc605e10303ec6ae45cf106c12540754a9970bcce0f80cae"
dependencies = [ dependencies = [
"quote", "quote",
"syn", "syn 1.0.109",
] ]
[[package]] [[package]]
@ -1466,7 +1452,7 @@ checksum = "3eb14ed937631bd8b8b8977f2c198443447a8355b6e3ca599f38c975e5a963b6"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn", "syn 1.0.109",
] ]
[[package]] [[package]]
@ -1527,9 +1513,9 @@ dependencies = [
[[package]] [[package]]
name = "geo" name = "geo"
version = "0.23.1" version = "0.24.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b39f57e9624b1a17ce621375464e9878c705d0aaadaf25cb44e4e0005a16de2f" checksum = "c7d640a4dd1d1c98b45f4653c841a8ec15f461a71b86bc30533ae64c6f20f268"
dependencies = [ dependencies = [
"float_next_after", "float_next_after",
"geo-types", "geo-types",
@ -1559,7 +1545,6 @@ version = "0.2.3"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8ea804e7bd3c6a4ca6a01edfa35231557a8a81d4d3f3e1e2b650d028c42592be" checksum = "8ea804e7bd3c6a4ca6a01edfa35231557a8a81d4d3f3e1e2b650d028c42592be"
dependencies = [ dependencies = [
"accurate",
"lazy_static", "lazy_static",
] ]
@ -1862,16 +1847,16 @@ dependencies = [
[[package]] [[package]]
name = "iana-time-zone" name = "iana-time-zone"
version = "0.1.53" version = "0.1.54"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "64c122667b287044802d6ce17ee2ddf13207ed924c712de9a66a5814d5b64765" checksum = "0c17cc76786e99f8d2f055c11159e7f0091c42474dcc3189fbab96072e873e6d"
dependencies = [ dependencies = [
"android_system_properties", "android_system_properties",
"core-foundation-sys", "core-foundation-sys",
"iana-time-zone-haiku", "iana-time-zone-haiku",
"js-sys", "js-sys",
"wasm-bindgen", "wasm-bindgen",
"winapi", "windows",
] ]
[[package]] [[package]]
@ -1900,12 +1885,6 @@ dependencies = [
"unicode-normalization", "unicode-normalization",
] ]
[[package]]
name = "ieee754"
version = "0.2.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9007da9cacbd3e6343da136e98b0d2df013f553d35bdec8b518f07bea768e19c"
[[package]] [[package]]
name = "imbl" name = "imbl"
version = "1.0.1" version = "1.0.1"
@ -1922,9 +1901,9 @@ dependencies = [
[[package]] [[package]]
name = "indexmap" name = "indexmap"
version = "1.9.2" version = "1.9.3"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1885e79c1fc4b10f0e172c475f458b7f7b93061064d98c3293e98c5ba0c8b399" checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99"
dependencies = [ dependencies = [
"autocfg", "autocfg",
"hashbrown", "hashbrown",
@ -1964,10 +1943,11 @@ dependencies = [
[[package]] [[package]]
name = "io-lifetimes" name = "io-lifetimes"
version = "1.0.6" version = "1.0.9"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cfa919a82ea574332e2de6e74b4c36e74d41982b335080fa59d4ef31be20fdf3" checksum = "09270fd4fa1111bc614ed2246c7ef56239a3063d5be0d1ec3b589c505d400aeb"
dependencies = [ dependencies = [
"hermit-abi 0.3.1",
"libc", "libc",
"windows-sys 0.45.0", "windows-sys 0.45.0",
] ]
@ -1980,9 +1960,9 @@ checksum = "30e22bd8629359895450b59ea7a776c850561b96a3b1d31321c1949d9e6c9146"
[[package]] [[package]]
name = "is-terminal" name = "is-terminal"
version = "0.4.4" version = "0.4.5"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "21b6b32576413a8e69b90e952e4a026476040d81017b80445deda5f2d3921857" checksum = "8687c819457e979cc940d09cb16e42a1bf70aa6b60a549de6d3a62a0ee90c69e"
dependencies = [ dependencies = [
"hermit-abi 0.3.1", "hermit-abi 0.3.1",
"io-lifetimes", "io-lifetimes",
@ -2208,9 +2188,9 @@ checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d"
[[package]] [[package]]
name = "mime" name = "mime"
version = "0.3.16" version = "0.3.17"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2a60c7ce501c71e03a9c9c0d35b861413ae925bd979cc7a4e30d060069aaac8d" checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a"
[[package]] [[package]]
name = "mime_guess" name = "mime_guess"
@ -2320,14 +2300,14 @@ dependencies = [
[[package]] [[package]]
name = "nix" name = "nix"
version = "0.25.1" version = "0.26.2"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f346ff70e7dbfd675fe90590b92d59ef2de15a8779ae305ebcbfd3f0caf59be4" checksum = "bfdda3d196821d6af13126e40375cdf7da646a96114af134d5f417a9a1dc8e1a"
dependencies = [ dependencies = [
"autocfg",
"bitflags", "bitflags",
"cfg-if", "cfg-if",
"libc", "libc",
"static_assertions",
] ]
[[package]] [[package]]
@ -2399,9 +2379,9 @@ checksum = "b7e5500299e16ebb147ae15a00a942af264cf3688f47923b8fc2cd5858f23ad3"
[[package]] [[package]]
name = "openssl" name = "openssl"
version = "0.10.46" version = "0.10.48"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fd2523381e46256e40930512c7fd25562b9eae4812cb52078f155e87217c9d1e" checksum = "518915b97df115dd36109bfa429a48b8f737bd05508cf9588977b599648926d2"
dependencies = [ dependencies = [
"bitflags", "bitflags",
"cfg-if", "cfg-if",
@ -2420,7 +2400,7 @@ checksum = "b501e44f11665960c7e7fcf062c7d96a14ade4aa98116c004b2e37b5be7d736c"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn", "syn 1.0.109",
] ]
[[package]] [[package]]
@ -2431,18 +2411,18 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf"
[[package]] [[package]]
name = "openssl-src" name = "openssl-src"
version = "111.25.1+1.1.1t" version = "111.25.2+1.1.1t"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1ef9a9cc6ea7d9d5e7c4a913dc4b48d0e359eddf01af1dfec96ba7064b4aba10" checksum = "320708a054ad9b3bf314688b5db87cf4d6683d64cfc835e2337924ae62bf4431"
dependencies = [ dependencies = [
"cc", "cc",
] ]
[[package]] [[package]]
name = "openssl-sys" name = "openssl-sys"
version = "0.9.81" version = "0.9.83"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "176be2629957c157240f68f61f2d0053ad3a4ecfdd9ebf1e6521d18d9635cf67" checksum = "666416d899cf077260dac8698d60a60b435a46d57e82acb1be3d0dad87284e5b"
dependencies = [ dependencies = [
"autocfg", "autocfg",
"cc", "cc",
@ -2454,9 +2434,9 @@ dependencies = [
[[package]] [[package]]
name = "os_str_bytes" name = "os_str_bytes"
version = "6.4.1" version = "6.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9b7820b9daea5457c9f21c69448905d723fbd21136ccf521748f23fd49e723ee" checksum = "ceedf44fb00f2d1984b0bc98102627ce622e083e49a5bacdb3e514fa4238e267"
[[package]] [[package]]
name = "parking" name = "parking"
@ -2514,9 +2494,9 @@ dependencies = [
[[package]] [[package]]
name = "password-hash" name = "password-hash"
version = "0.4.2" version = "0.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7676374caaee8a325c9e7a2ae557f216c5563a171d6997b0ef8a65af35147700" checksum = "346f04948ba92c43e8469c1ee6736c7563d71012b17d40745260fe106aac2166"
dependencies = [ dependencies = [
"base64ct", "base64ct",
"rand_core 0.6.4", "rand_core 0.6.4",
@ -2531,9 +2511,9 @@ checksum = "9f746c4065a8fa3fe23974dd82f15431cc8d40779821001404d10d2e79ca7d79"
[[package]] [[package]]
name = "pbkdf2" name = "pbkdf2"
version = "0.11.0" version = "0.12.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "83a0692ec44e4cf1ef28ca317f14f8f07da2d95ec3fa01f86e4467b725e60917" checksum = "f0ca0b5a68607598bf3bad68f32227a8164f6254833f84eafaac409cd6746c31"
dependencies = [ dependencies = [
"digest", "digest",
"hmac", "hmac",
@ -2609,7 +2589,7 @@ checksum = "069bdb1e05adc7a8990dce9cc75370895fbe4e3d58b9b73bf1aee56359344a55"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn", "syn 1.0.109",
] ]
[[package]] [[package]]
@ -2643,7 +2623,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6c8646e95016a7a6c4adea95bafa8a16baab64b583356217f2c85db4a39d9a86" checksum = "6c8646e95016a7a6c4adea95bafa8a16baab64b583356217f2c85db4a39d9a86"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"syn", "syn 1.0.109",
] ]
[[package]] [[package]]
@ -2665,7 +2645,7 @@ dependencies = [
"proc-macro-error-attr", "proc-macro-error-attr",
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn", "syn 1.0.109",
"version_check", "version_check",
] ]
@ -2682,9 +2662,9 @@ dependencies = [
[[package]] [[package]]
name = "proc-macro2" name = "proc-macro2"
version = "1.0.52" version = "1.0.53"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1d0e1ae9e836cc3beddd63db0df682593d7e2d3d891ae8c9083d2113e1744224" checksum = "ba466839c78239c09faf015484e5cc04860f88242cff4d03eb038f04b4699b73"
dependencies = [ dependencies = [
"unicode-ident", "unicode-ident",
] ]
@ -2776,7 +2756,7 @@ dependencies = [
"prost 0.11.8", "prost 0.11.8",
"prost-types 0.11.8", "prost-types 0.11.8",
"regex", "regex",
"syn", "syn 1.0.109",
"tempfile", "tempfile",
"which", "which",
] ]
@ -2791,7 +2771,7 @@ dependencies = [
"itertools 0.9.0", "itertools 0.9.0",
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn", "syn 1.0.109",
] ]
[[package]] [[package]]
@ -2804,7 +2784,7 @@ dependencies = [
"itertools 0.10.5", "itertools 0.10.5",
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn", "syn 1.0.109",
] ]
[[package]] [[package]]
@ -2843,7 +2823,7 @@ dependencies = [
"proc-macro2", "proc-macro2",
"prost-build 0.7.0", "prost-build 0.7.0",
"quote", "quote",
"syn", "syn 1.0.109",
] ]
[[package]] [[package]]
@ -2985,9 +2965,9 @@ dependencies = [
[[package]] [[package]]
name = "regex" name = "regex"
version = "1.7.1" version = "1.7.3"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "48aaa5748ba571fb95cd2c85c09f629215d3a6ece942baa100950af03a34f733" checksum = "8b1f693b24f6ac912f4893ef08244d70b6067480d2f1a46e950c9691e6749d1d"
dependencies = [ dependencies = [
"aho-corasick", "aho-corasick",
"memchr", "memchr",
@ -2996,9 +2976,9 @@ dependencies = [
[[package]] [[package]]
name = "regex-syntax" name = "regex-syntax"
version = "0.6.28" version = "0.6.29"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "456c603be3e8d448b072f410900c09faf164fbce2d480456f50eea6e25f9c848" checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1"
[[package]] [[package]]
name = "relative-path" name = "relative-path"
@ -3008,9 +2988,9 @@ checksum = "4bf2521270932c3c7bed1a59151222bd7643c79310f2916f01925e1e16255698"
[[package]] [[package]]
name = "reqwest" name = "reqwest"
version = "0.11.14" version = "0.11.15"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "21eed90ec8570952d53b772ecf8f206aa1ec9a3d76b2521c56c42973f2d91ee9" checksum = "0ba30cc2c0cd02af1222ed216ba659cdb2f879dfe3181852fe7c50b1d0005949"
dependencies = [ dependencies = [
"base64 0.21.0", "base64 0.21.0",
"bytes", "bytes",
@ -3157,7 +3137,7 @@ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
"rquickjs-core", "rquickjs-core",
"syn", "syn 1.0.109",
] ]
[[package]] [[package]]
@ -3172,9 +3152,9 @@ dependencies = [
[[package]] [[package]]
name = "rstar" name = "rstar"
version = "0.9.3" version = "0.10.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b40f1bfe5acdab44bc63e6699c28b74f75ec43afb59f3eda01e145aff86a25fa" checksum = "1f39465655a1e3d8ae79c6d9e007f4953bfc5d55297602df9dc38f9ae9f1359a"
dependencies = [ dependencies = [
"heapless", "heapless",
"num-traits", "num-traits",
@ -3198,9 +3178,9 @@ dependencies = [
[[package]] [[package]]
name = "rustix" name = "rustix"
version = "0.36.9" version = "0.36.11"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fd5c6ff11fecd55b40746d1995a02f2eb375bf8c00d192d521ee09f42bef37bc" checksum = "db4165c9963ab29e422d6c26fbc1d37f15bace6b2810221f9d925023480fcf0e"
dependencies = [ dependencies = [
"bitflags", "bitflags",
"errno", "errno",
@ -3248,9 +3228,9 @@ checksum = "4f3208ce4d8448b3f3e7d168a73f5e0c43a61e32930de3bceeccedb388b6bf06"
[[package]] [[package]]
name = "rustyline" name = "rustyline"
version = "10.1.1" version = "11.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c1e83c32c3f3c33b08496e0d1df9ea8c64d39adb8eb36a1ebb1440c690697aef" checksum = "5dfc8644681285d1fb67a467fb3021bfea306b99b4146b166a1fe3ada965eece"
dependencies = [ dependencies = [
"bitflags", "bitflags",
"cfg-if", "cfg-if",
@ -3328,11 +3308,10 @@ checksum = "1792db035ce95be60c3f8853017b3999209281c24e2ba5bc8e59bf97a0c590c1"
[[package]] [[package]]
name = "scrypt" name = "scrypt"
version = "0.10.0" version = "0.11.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9f9e24d2b632954ded8ab2ef9fea0a0c769ea56ea98bddbafbad22caeeadf45d" checksum = "0516a385866c09368f0b5bcd1caff3366aace790fcd46e2bb032697bb172fd1f"
dependencies = [ dependencies = [
"hmac",
"password-hash", "password-hash",
"pbkdf2", "pbkdf2",
"salsa20", "salsa20",
@ -3389,9 +3368,9 @@ checksum = "cd0b0ec5f1c1ca621c432a25813d8d60c88abe6d3e08a3eb9cf37d97a0fe3d73"
[[package]] [[package]]
name = "serde" name = "serde"
version = "1.0.156" version = "1.0.158"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "314b5b092c0ade17c00142951e50ced110ec27cea304b1037c6969246c2469a4" checksum = "771d4d9c4163ee138805e12c710dd365e4f44be8be0503cb1bb9eb989425d9c9"
dependencies = [ dependencies = [
"serde_derive", "serde_derive",
] ]
@ -3408,13 +3387,13 @@ dependencies = [
[[package]] [[package]]
name = "serde_derive" name = "serde_derive"
version = "1.0.156" version = "1.0.158"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d7e29c4601e36bcec74a223228dce795f4cd3616341a4af93520ca1a837c087d" checksum = "e801c1712f48475582b7696ac71e0ca34ebb30e09338425384269d9717c62cad"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn", "syn 2.0.10",
] ]
[[package]] [[package]]
@ -3430,9 +3409,9 @@ dependencies = [
[[package]] [[package]]
name = "serde_path_to_error" name = "serde_path_to_error"
version = "0.1.10" version = "0.1.11"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "db0969fff533976baadd92e08b1d102c5a3d8a8049eadfd69d4d1e3c5b2ed189" checksum = "f7f05c1d5476066defcdfacce1f52fc3cae3af1d3089727100c02ae92e5abbe0"
dependencies = [ dependencies = [
"serde", "serde",
] ]
@ -3707,7 +3686,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "552bb4f9eb49f493b14d79d989ea9ecb53ee8cee0aad529e289faca72fb78b14" checksum = "552bb4f9eb49f493b14d79d989ea9ecb53ee8cee0aad529e289faca72fb78b14"
dependencies = [ dependencies = [
"quote", "quote",
"syn", "syn 1.0.109",
] ]
[[package]] [[package]]
@ -3721,6 +3700,17 @@ dependencies = [
"unicode-ident", "unicode-ident",
] ]
[[package]]
name = "syn"
version = "2.0.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5aad1363ed6d37b84299588d62d3a7d95b5a5c2d9aad5c85609fda12afaa1f40"
dependencies = [
"proc-macro2",
"quote",
"unicode-ident",
]
[[package]] [[package]]
name = "sync_wrapper" name = "sync_wrapper"
version = "0.1.2" version = "0.1.2"
@ -3769,22 +3759,22 @@ checksum = "222a222a5bfe1bba4a77b45ec488a741b3cb8872e5e499451fd7d0129c9c7c3d"
[[package]] [[package]]
name = "thiserror" name = "thiserror"
version = "1.0.39" version = "1.0.40"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a5ab016db510546d856297882807df8da66a16fb8c4101cb8b30054b0d5b2d9c" checksum = "978c9a314bd8dc99be594bc3c175faaa9794be04a5a5e153caba6915336cebac"
dependencies = [ dependencies = [
"thiserror-impl", "thiserror-impl",
] ]
[[package]] [[package]]
name = "thiserror-impl" name = "thiserror-impl"
version = "1.0.39" version = "1.0.40"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5420d42e90af0c38c3290abcca25b9b3bdf379fc9f55c528f53a269d9c9a267e" checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn", "syn 2.0.10",
] ]
[[package]] [[package]]
@ -3964,7 +3954,7 @@ checksum = "d266c00fde287f55d3f1c3e96c500c362a2b8c695076ec180f27918820bc6df8"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn", "syn 1.0.109",
] ]
[[package]] [[package]]
@ -4051,9 +4041,9 @@ checksum = "3ab8ed2edee10b50132aed5f331333428b011c99402b5a534154ed15746f9622"
[[package]] [[package]]
name = "toml_edit" name = "toml_edit"
version = "0.19.7" version = "0.19.8"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "dc18466501acd8ac6a3f615dd29a3438f8ca6bb3b19537138b3106e575621274" checksum = "239410c8609e8125456927e6707163a3b1fdb40561e4b803bc041f466ccfdc13"
dependencies = [ dependencies = [
"indexmap", "indexmap",
"toml_datetime", "toml_datetime",
@ -4203,9 +4193,9 @@ dependencies = [
[[package]] [[package]]
name = "unicode-bidi" name = "unicode-bidi"
version = "0.3.11" version = "0.3.13"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "524b68aca1d05e03fdf03fcdce2c6c94b6daf6d16861ddaa7e4f2b6638a9052c" checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460"
[[package]] [[package]]
name = "unicode-ident" name = "unicode-ident"
@ -4301,12 +4291,11 @@ checksum = "9d5b2c62b4012a3e1eca5a7e077d13b3bf498c4073e33ccd58626607748ceeca"
[[package]] [[package]]
name = "walkdir" name = "walkdir"
version = "2.3.2" version = "2.3.3"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "808cf2735cd4b6866113f648b791c6adc5714537bc222d9347bb203386ffda56" checksum = "36df944cda56c7d8d8b7496af378e6b16de9284591917d307c9b4d313c44e698"
dependencies = [ dependencies = [
"same-file", "same-file",
"winapi",
"winapi-util", "winapi-util",
] ]
@ -4394,7 +4383,7 @@ dependencies = [
"once_cell", "once_cell",
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn", "syn 1.0.109",
"wasm-bindgen-shared", "wasm-bindgen-shared",
] ]
@ -4428,7 +4417,7 @@ checksum = "2aff81306fcac3c7515ad4e177f521b5c9a15f2b08f4e32d823066102f35a5f6"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn", "syn 1.0.109",
"wasm-bindgen-backend", "wasm-bindgen-backend",
"wasm-bindgen-shared", "wasm-bindgen-shared",
] ]
@ -4523,6 +4512,15 @@ version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
[[package]]
name = "windows"
version = "0.46.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cdacb41e6a96a052c6cb63a144f24900236121c6f63f4f8219fef5977ecb0c25"
dependencies = [
"windows-targets",
]
[[package]] [[package]]
name = "windows-sys" name = "windows-sys"
version = "0.42.0" version = "0.42.0"
@ -4606,9 +4604,9 @@ checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0"
[[package]] [[package]]
name = "winnow" name = "winnow"
version = "0.3.6" version = "0.4.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "23d020b441f92996c80d94ae9166e8501e59c7bb56121189dc9eab3bd8216966" checksum = "ae8970b36c66498d8ff1d66685dc86b91b29db0c7739899012f63a63814b4b28"
dependencies = [ dependencies = [
"memchr", "memchr",
] ]

28
Cargo.toml
View file

@ -25,28 +25,28 @@ panic = 'abort'
codegen-units = 1 codegen-units = 1
[dependencies] [dependencies]
argon2 = "0.4.1" argon2 = "0.5.0"
clap = { version = "3.2.23", features = ["env"] } clap = { version = "3.2.23", features = ["env"] }
base64 = "0.21.0" base64 = "0.21.0"
bytes = "1.4.0" bytes = "1.4.0"
chrono = { version = "0.4.23", features = ["serde"] } chrono = { version = "0.4.24", features = ["serde"] }
fern = { version = "0.6.1", features = ["colored"] } fern = { version = "0.6.2", features = ["colored"] }
futures = "0.3.26" futures = "0.3.27"
http = "0.2.8" http = "0.2.9"
hyper = "0.14.24" hyper = "0.14.25"
jsonwebtoken = "8.2.0" jsonwebtoken = "8.3.0"
log = "0.4.17" log = "0.4.17"
once_cell = "1.17.0" once_cell = "1.17.1"
rand = "0.8.5" rand = "0.8.5"
reqwest = { version = "0.11.14", features = ["blocking"] } reqwest = { version = "0.11.15", features = ["blocking"] }
rustyline = "10.1.1" rustyline = "11.0.0"
serde = { version = "1.0.152", features = ["derive"] } serde = { version = "1.0.158", features = ["derive"] }
serde_cbor = "0.11.2" serde_cbor = "0.11.2"
serde_json = "1.0.93" serde_json = "1.0.94"
serde_pack = { version = "1.1.1", package = "rmp-serde" } serde_pack = { version = "1.1.1", package = "rmp-serde" }
surrealdb = { path = "lib", features = ["protocol-http", "protocol-ws", "rustls"] } surrealdb = { path = "lib", features = ["protocol-http", "protocol-ws", "rustls"] }
thiserror = "1.0.38" thiserror = "1.0.40"
tokio = { version = "1.25.0", features = ["macros", "signal"] } tokio = { version = "1.26.0", features = ["macros", "signal"] }
urlencoding = "2.1.2" urlencoding = "2.1.2"
warp = { version = "0.3.3", features = ["compression", "tls", "websocket"] } warp = { version = "0.3.3", features = ["compression", "tls", "websocket"] }

42
lib/Cargo.toml
View file

@ -51,24 +51,24 @@ targets = []
[dependencies] [dependencies]
addr = { version = "0.15.6", default-features = false, features = ["std"] } addr = { version = "0.15.6", default-features = false, features = ["std"] }
argon2 = "0.4.1" argon2 = "0.5.0"
async-recursion = "1.0.2" async-recursion = "1.0.4"
bcrypt = "0.14.0" bcrypt = "0.14.0"
bigdecimal = { version = "0.3.0", features = ["serde", "string-only"] } bigdecimal = { version = "0.3.0", features = ["serde", "string-only"] }
channel = { version = "1.8.0", package = "async-channel" } channel = { version = "1.8.0", package = "async-channel" }
chrono = { version = "0.4.23", features = ["serde"] } chrono = { version = "0.4.24", features = ["serde"] }
derive = { version = "0.5.0", package = "surrealdb-derive" } derive = { version = "0.5.0", package = "surrealdb-derive" }
deunicode = "1.3.3" deunicode = "1.3.3"
dmp = "0.1.2" dmp = "0.1.2"
echodb = { version = "0.3.0", optional = true } echodb = { version = "0.3.0", optional = true }
executor = { version = "1.5.0", package = "async-executor" } executor = { version = "1.5.0", package = "async-executor" }
flume = "0.10.14" flume = "0.10.14"
futures = "0.3.26" futures = "0.3.27"
futures-concurrency = "7.1.0" futures-concurrency = "7.1.0"
foundationdb = { version = "0.7.0", default-features = false, features = ["embedded-fdb-include"], optional = true } foundationdb = { version = "0.7.0", default-features = false, features = ["embedded-fdb-include"], optional = true }
fuzzy-matcher = "0.3.7" fuzzy-matcher = "0.3.7"
geo = { version = "0.23.1", features = ["use-serde"] } geo = { version = "0.24.1", features = ["use-serde"] }
indexmap = { version = "1.9.2", features = ["serde"] } indexmap = { version = "1.9.3", features = ["serde"] }
indxdb = { version = "0.2.0", optional = true } indxdb = { version = "0.2.0", optional = true }
js = { version = "0.1.7", package = "rquickjs", features = ["array-buffer", "bindgen", "classes", "futures", "loader", "macro", "parallel", "properties"], optional = true } js = { version = "0.1.7", package = "rquickjs", features = ["array-buffer", "bindgen", "classes", "futures", "loader", "macro", "parallel", "properties"], optional = true }
lexical-sort = "0.3.1" lexical-sort = "0.3.1"
@ -78,24 +78,24 @@ msgpack = { version = "1.1.1", package = "rmp-serde" }
nanoid = "0.4.0" nanoid = "0.4.0"
native-tls = { version = "0.2.11", optional = true } native-tls = { version = "0.2.11", optional = true }
nom = { version = "7.1.3", features = ["alloc"] } nom = { version = "7.1.3", features = ["alloc"] }
once_cell = "1.17.0" once_cell = "1.17.1"
pbkdf2 = "0.11.0" pbkdf2 = { version = "0.12.1", features = ["simple"] }
rand = "0.8.5" rand = "0.8.5"
regex = "1.7.1" regex = "1.7.3"
reqwest = { version = "0.11.14", default-features = false, features = ["json", "stream"], optional = true } reqwest = { version = "0.11.15", default-features = false, features = ["json", "stream"], optional = true }
rocksdb = { version = "0.20.1", optional = true } rocksdb = { version = "0.20.1", optional = true }
rustls = { version = "0.20.8", optional = true } rustls = { version = "0.20.8", optional = true }
scrypt = "0.10.0" scrypt = "0.11.0"
semver = { version = "1.0.16", features = ["serde"] } semver = { version = "1.0.17", features = ["serde"] }
serde = { version = "1.0.152", features = ["derive"] } serde = { version = "1.0.158", features = ["derive"] }
serde_json = "1.0.93" serde_json = "1.0.94"
sha-1 = "0.10.1" sha-1 = "0.10.1"
sha2 = "0.10.6" sha2 = "0.10.6"
storekey = "0.4.0" storekey = "0.4.0"
thiserror = "1.0.38" thiserror = "1.0.40"
tikv = { version = "0.1.0", package = "tikv-client", optional = true } tikv = { version = "0.1.0", package = "tikv-client", optional = true }
tokio-stream = { version = "0.1.11", optional = true } tokio-stream = { version = "0.1.12", optional = true }
tokio-util = { version = "0.7.6", optional = true, features = ["compat"] } tokio-util = { version = "0.7.7", optional = true, features = ["compat"] }
trice = "0.3.0" trice = "0.3.0"
ulid = { version = "1.0.0", features = ["serde"] } ulid = { version = "1.0.0", features = ["serde"] }
url = "2.3.1" url = "2.3.1"
@ -103,17 +103,17 @@ url = "2.3.1"
[dev-dependencies] [dev-dependencies]
env_logger = "0.10.0" env_logger = "0.10.0"
temp-dir = "0.1.11" temp-dir = "0.1.11"
time = { version = "0.3.17", features = ["serde"] } time = { version = "0.3.20", features = ["serde"] }
tokio = { version = "1.25.0", features = ["macros", "rt", "rt-multi-thread"] } tokio = { version = "1.26.0", features = ["macros", "rt", "rt-multi-thread"] }
[target.'cfg(target_arch = "wasm32")'.dependencies] [target.'cfg(target_arch = "wasm32")'.dependencies]
pharos = "0.5.3" pharos = "0.5.3"
tokio = { version = "1.25.0", default-features = false, features = ["rt"] } tokio = { version = "1.26.0", default-features = false, features = ["rt"] }
uuid = { version = "1.3.0", features = ["serde", "js", "v4", "v7"] } uuid = { version = "1.3.0", features = ["serde", "js", "v4", "v7"] }
wasm-bindgen-futures = "0.4.34" wasm-bindgen-futures = "0.4.34"
ws_stream_wasm = "0.7.4" ws_stream_wasm = "0.7.4"
[target.'cfg(not(target_arch = "wasm32"))'.dependencies] [target.'cfg(not(target_arch = "wasm32"))'.dependencies]
tokio = { version = "1.25.0", default-features = false, features = ["io-util", "fs", "rt-multi-thread"] } tokio = { version = "1.26.0", default-features = false, features = ["io-util", "fs", "rt-multi-thread"] }
tokio-tungstenite = { version = "0.18.0", optional = true } tokio-tungstenite = { version = "0.18.0", optional = true }
uuid = { version = "1.3.0", features = ["serde", "v4", "v7"] } uuid = { version = "1.3.0", features = ["serde", "v4", "v7"] }

6
lib/examples/actix/Cargo.toml
View file

@ -5,7 +5,7 @@ edition = "2021"
publish = false publish = false
[dependencies] [dependencies]
actix-web = { version = "4.3.0", features = ["macros"] } actix-web = { version = "4.3.1", features = ["macros"] }
serde = { version = "1.0.152", features = ["derive"] } serde = { version = "1.0.158", features = ["derive"] }
surrealdb = { path = "../.." } surrealdb = { path = "../.." }
thiserror = "1.0.38" thiserror = "1.0.40"

8
lib/examples/axum/Cargo.toml
View file

@ -5,9 +5,9 @@ edition = "2021"
publish = false publish = false
[dependencies] [dependencies]
axum = "0.6.11" axum = "0.6.12"
http = "0.2.9" http = "0.2.9"
serde = { version = "1.0.152", features = ["derive"] } serde = { version = "1.0.158", features = ["derive"] }
surrealdb = { path = "../.." } surrealdb = { path = "../.." }
thiserror = "1.0.38" thiserror = "1.0.40"
tokio = { version = "1.25.0", features = ["macros", "rt-multi-thread"] } tokio = { version = "1.26.0", features = ["macros", "rt-multi-thread"] }

6
lib/src/fnc/crypto.rs
View file

@ -106,7 +106,7 @@ pub mod argon2 {
pub fn gen((pass,): (String,)) -> Result<Value, Error> { pub fn gen((pass,): (String,)) -> Result<Value, Error> {
let algo = Argon2::default(); let algo = Argon2::default();
let salt = SaltString::generate(&mut OsRng); let salt = SaltString::generate(&mut OsRng);
let hash = algo.hash_password(pass.as_ref(), salt.as_ref()).unwrap().to_string(); let hash = algo.hash_password(pass.as_ref(), &salt).unwrap().to_string();
Ok(hash.into()) Ok(hash.into())
} }
} }
@ -172,7 +172,7 @@ pub mod pbkdf2 {
pub fn gen((pass,): (String,)) -> Result<Value, Error> { pub fn gen((pass,): (String,)) -> Result<Value, Error> {
let salt = SaltString::generate(&mut OsRng); let salt = SaltString::generate(&mut OsRng);
let hash = Pbkdf2.hash_password(pass.as_ref(), salt.as_ref()).unwrap().to_string(); let hash = Pbkdf2.hash_password(pass.as_ref(), &salt).unwrap().to_string();
Ok(hash.into()) Ok(hash.into())
} }
} }
@ -207,7 +207,7 @@ pub mod scrypt {
pub fn gen((pass,): (String,)) -> Result<Value, Error> { pub fn gen((pass,): (String,)) -> Result<Value, Error> {
let salt = SaltString::generate(&mut OsRng); let salt = SaltString::generate(&mut OsRng);
let hash = Scrypt.hash_password(pass.as_ref(), salt.as_ref()).unwrap().to_string(); let hash = Scrypt.hash_password(pass.as_ref(), &salt).unwrap().to_string();
Ok(hash.into()) Ok(hash.into())
} }
} }

4
lib/src/fnc/geo.rs
View file

@ -1,7 +1,7 @@
use crate::err::Error; use crate::err::Error;
use crate::sql::geometry::Geometry; use crate::sql::geometry::Geometry;
use crate::sql::value::Value; use crate::sql::value::Value;
use geo::algorithm::bearing::Bearing; use geo::algorithm::bearing::HaversineBearing;
use geo::algorithm::centroid::Centroid; use geo::algorithm::centroid::Centroid;
use geo::algorithm::chamberlain_duquette_area::ChamberlainDuquetteArea; use geo::algorithm::chamberlain_duquette_area::ChamberlainDuquetteArea;
use geo::algorithm::haversine_distance::HaversineDistance; use geo::algorithm::haversine_distance::HaversineDistance;
@ -28,7 +28,7 @@ pub fn area((arg,): (Value,)) -> Result<Value, Error> {
pub fn bearing(points: (Value, Value)) -> Result<Value, Error> { pub fn bearing(points: (Value, Value)) -> Result<Value, Error> {
Ok(match points { Ok(match points {
(Value::Geometry(Geometry::Point(v)), Value::Geometry(Geometry::Point(w))) => { (Value::Geometry(Geometry::Point(v)), Value::Geometry(Geometry::Point(w))) => {
v.bearing(w).into() v.haversine_bearing(w).into()
} }
_ => Value::None, _ => Value::None,
}) })

2
lib/src/sql/statements/define.rs
View file

@ -389,7 +389,7 @@ fn login(i: &str) -> IResult<&str, DefineLoginStatement> {
hash: match opts { hash: match opts {
DefineLoginOption::Passhash(v) => v, DefineLoginOption::Passhash(v) => v,
DefineLoginOption::Password(v) => Argon2::default() DefineLoginOption::Password(v) => Argon2::default()
.hash_password(v.as_ref(), SaltString::generate(&mut OsRng).as_ref()) .hash_password(v.as_ref(), &SaltString::generate(&mut OsRng))
.unwrap() .unwrap()
.to_string(), .to_string(),
}, },

24
src/cli/sql.rs
View file

@ -1,12 +1,11 @@
use crate::err::Error; use crate::err::Error;
use rustyline::error::ReadlineError; use rustyline::error::ReadlineError;
use rustyline::Editor; use rustyline::DefaultEditor;
use serde_json::Value; use serde_json::Value;
use surrealdb::engine::any::connect; use surrealdb::engine::any::connect;
use surrealdb::error::Api as ApiError; use surrealdb::error::Api as ApiError;
use surrealdb::opt::auth::Root; use surrealdb::opt::auth::Root;
use surrealdb::sql; use surrealdb::sql;
use surrealdb::sql::statements::SetStatement;
use surrealdb::sql::Statement; use surrealdb::sql::Statement;
use surrealdb::Error as SurrealError; use surrealdb::Error as SurrealError;
use surrealdb::Response; use surrealdb::Response;
@ -40,7 +39,7 @@ pub async fn init(matches: &clap::ArgMatches) -> Result<(), Error> {
} }
} }
// Create a new terminal REPL // Create a new terminal REPL
let mut rl = Editor::<()>::new().unwrap(); let mut rl = DefaultEditor::new().unwrap();
// Load the command-line history // Load the command-line history
let _ = rl.load_history("history.txt"); let _ = rl.load_history("history.txt");
// Configure the prompt // Configure the prompt
@ -67,7 +66,9 @@ pub async fn init(matches: &clap::ArgMatches) -> Result<(), Error> {
continue; continue;
} }
// Add the entry to the history // Add the entry to the history
rl.add_history_entry(line.as_str()); if let Err(e) = rl.add_history_entry(line.as_str()) {
eprintln!("{e}");
}
// Complete the request // Complete the request
match sql::parse(&line) { match sql::parse(&line) {
Ok(query) => { Ok(query) => {
@ -81,12 +82,9 @@ pub async fn init(matches: &clap::ArgMatches) -> Result<(), Error> {
db = Some(database.clone()); db = Some(database.clone());
} }
} }
Statement::Set(SetStatement { Statement::Set(stmt) => {
name, if let Err(e) = client.set(&stmt.name, &stmt.what).await {
what, eprintln!("{e}");
}) => {
if let Err(error) = client.set(name, what).await {
eprintln!("{error}");
} }
} }
_ => {} _ => {}
@ -99,7 +97,7 @@ pub async fn init(matches: &clap::ArgMatches) -> Result<(), Error> {
Err(e) => eprintln!("{e}"), Err(e) => eprintln!("{e}"),
} }
} }
Err(error) => eprintln!("{error}"), Err(e) => eprintln!("{e}"),
} }
} }
// The user types CTRL-C // The user types CTRL-C
@ -111,8 +109,8 @@ pub async fn init(matches: &clap::ArgMatches) -> Result<(), Error> {
break; break;
} }
// There was en error // There was en error
Err(err) => { Err(e) => {
eprintln!("Error: {err:?}"); eprintln!("Error: {e:?}");
break; break;
} }
} }