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

Update dependencies and add ml2 feature (#3385)

Browse source
This commit is contained in:
Rushmore Mushambi 2024-02-09 21:31:16 +02:00 committed by GitHub
parent 40039dc1ad
commit 454509e4d1
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
21 changed files with 472 additions and 404 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.github/workflows/ci.yml vendored
View file

@ -247,7 +247,7 @@ jobs:
- name: Install stable toolchain
uses: dtolnay/rust-toolchain@stable
with:
toolchain: 1.74.1
toolchain: 1.75.0
- name: Checkout sources
uses: actions/checkout@v3

353
Cargo.lock generated
View file

@ -4,11 +4,11 @@ version = 3
[[package]]
name = "actix-codec"
version = "0.5.1"
version = "0.5.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "617a8268e3537fe1d8c9ead925fca49ef6400927ee7bc26750e90ecee14ce4b8"
checksum = "5f7b0a21988c1bf877cf4759ef5ddaac04c1c9fe808c9142ecb78ba97d97a28a"
dependencies = [
"bitflags 1.3.2",
"bitflags 2.4.2",
"bytes",
"futures-core",
"futures-sink",
@ -32,9 +32,9 @@ dependencies = [
[[package]]
name = "actix-http"
version = "3.5.1"
version = "3.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "129d4c88e98860e1758c5de288d1632b07970a16d59bdf7b8d66053d582bb71f"
checksum = "d223b13fd481fc0d1f83bb12659ae774d9e3601814c68a0bc539731698cca743"
dependencies = [
"actix-codec",
"actix-rt",
@ -142,9 +142,9 @@ dependencies = [
[[package]]
name = "actix-web"
version = "4.4.1"
version = "4.5.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e43428f3bf11dee6d166b00ec2df4e3aa8cc1606aaa0b7433c146852e2f4e03b"
checksum = "43a6556ddebb638c2358714d853257ed226ece6023ef9364f23f0c70737ea984"
dependencies = [
"actix-codec",
"actix-http",
@ -293,9 +293,9 @@ checksum = "4b46cbb362ab8752921c97e041f5e366ee6297bd428a31275b9fcf1e380f7299"
[[package]]
name = "anstream"
version = "0.6.9"
version = "0.6.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3fde6067df7359f2d6335ec1a50c1f8f825801687d10da0cc4c6b08e3f6afd15"
checksum = "6e2e1ebcb11de5c03c67de28a7df593d32191b44939c482e97702baaaa6ab6a5"
dependencies = [
"anstyle",
"anstyle-parse",
@ -307,9 +307,9 @@ dependencies = [
[[package]]
name = "anstyle"
version = "1.0.4"
version = "1.0.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7079075b41f533b8c61d2a4d073c4676e1f8b249ff94a393b0595db304e0dd87"
checksum = "8901269c6307e8d93993578286ac0edf7f195079ffff5ebdeea6a59ffb7e36bc"
[[package]]
name = "anstyle-parse"
@ -377,9 +377,9 @@ checksum = "bddcadddf5e9015d310179a59bb28c4d4b9920ad0f11e8e14dbadf654890c9a6"
[[package]]
name = "argon2"
version = "0.5.2"
version = "0.5.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "17ba4cac0a46bc1d2912652a751c47f2a9f3a7fe89bcae2275d418f5270402f9"
checksum = "3c3610892ee6e0cbce8ae2700349fcf8f98adb0dbfbee85aec3c9179d29cc072"
dependencies = [
"base64ct",
"blake2",
@ -889,9 +889,9 @@ checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf"
[[package]]
name = "bitmaps"
version = "3.2.0"
version = "3.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "703642b98a00b3b90513279a8ede3fcfa479c126c5fb46e78f3051522f021403"
checksum = "a1d084b0137aaa901caf9f1e8b21daa6aa24d41cd806e111335541eff9683bd6"
[[package]]
name = "bitvec"
@ -996,9 +996,9 @@ checksum = "7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec"
[[package]]
name = "bytecheck"
version = "0.6.11"
version = "0.6.12"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8b6372023ac861f6e6dc89c8344a8f398fb42aaba2b5dbc649ca0c0e9dbcb627"
checksum = "23cdc57ce23ac53c931e88a43d06d070a6fd142f2617be5855eb75efc9beb1c2"
dependencies = [
"bytecheck_derive",
"ptr_meta",
@ -1007,9 +1007,9 @@ dependencies = [
[[package]]
name = "bytecheck_derive"
version = "0.6.11"
version = "0.6.12"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a7ec4c6f261935ad534c0c22dbef2201b45918860eb1c574b972bd213a76af61"
checksum = "3db406d29fbcd95542e92559bed4d8ad92636d1ca8b3b72ede10b4bcc010e659"
dependencies = [
"proc-macro2",
"quote",
@ -1018,9 +1018,9 @@ dependencies = [
[[package]]
name = "bytemuck"
version = "1.14.0"
version = "1.14.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "374d28ec25809ee0e23827c2ab573d729e293f281dfe393500e7ad618baa61c6"
checksum = "ea31d69bda4949c1c1562c1e6f042a1caefac98cdc8a298260a2ff41c1e2d42b"
[[package]]
name = "byteorder"
@ -1150,9 +1150,9 @@ checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e"
[[package]]
name = "chrono"
version = "0.4.31"
version = "0.4.33"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7f2c685bad3eb3d45a01354cedb7d5faa66194d1d58ba6e267a8de788f79db38"
checksum = "9f13690e35a5e4ace198e7beea2895d29f3a9cc55015fcebe6336bd2010af9eb"
dependencies = [
"android-tzdata",
"iana-time-zone",
@ -1160,14 +1160,14 @@ dependencies = [
"num-traits",
"serde",
"wasm-bindgen",
"windows-targets 0.48.5",
"windows-targets 0.52.0",
]
[[package]]
name = "ciborium"
version = "0.2.1"
version = "0.2.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "effd91f6c78e5a4ace8a5d3c0b6bfaec9e2baaef55f3efc00e45fb2e477ee926"
checksum = "42e69ffd6f0917f5c029256a24d0161db17cea3997d185db0d35926308770f0e"
dependencies = [
"ciborium-io",
"ciborium-ll",
@ -1176,18 +1176,18 @@ dependencies = [
[[package]]
name = "ciborium-io"
version = "0.2.1"
version = "0.2.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cdf919175532b369853f5d5e20b26b43112613fd6fe7aee757e35f7a44642656"
checksum = "05afea1e0a06c9be33d539b876f1ce3692f4afea2cb41f740e7743225ed1c757"
[[package]]
name = "ciborium-ll"
version = "0.2.1"
version = "0.2.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "defaa24ecc093c77630e6c15e17c51f5e187bf35ee514f4e2d67baaa96dae22b"
checksum = "57663b653d948a338bfb3eeba9bb2fd5fcfaecb9e199e87e1eda4d9e8b240fd9"
dependencies = [
"ciborium-io",
"half 1.8.2",
"half",
]
[[package]]
@ -1461,9 +1461,9 @@ dependencies = [
[[package]]
name = "darling"
version = "0.20.3"
version = "0.20.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0209d94da627ab5605dcccf08bb18afa5009cfbef48d8a8b7d7bdbc79be25c5e"
checksum = "fc5d6b04b3fd0ba9926f945895de7d806260a2d7431ba82e7edaecb043c4c6b8"
dependencies = [
"darling_core",
"darling_macro",
@ -1471,9 +1471,9 @@ dependencies = [
[[package]]
name = "darling_core"
version = "0.20.3"
version = "0.20.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "177e3443818124b357d8e76f53be906d60937f0d3a90773a664fa63fa253e621"
checksum = "04e48a959bcd5c761246f5d090ebc2fbf7b9cd527a492b07a67510c108f1e7e3"
dependencies = [
"fnv",
"ident_case",
@ -1485,9 +1485,9 @@ dependencies = [
[[package]]
name = "darling_macro"
version = "0.20.3"
version = "0.20.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "836a9bbc7ad63342d6d6e7b815ccab164bc77a2d95d84bc3117a8c0d5c98e2d5"
checksum = "1d1545d67a2149e1d93b7e5c7752dce5a7426eb5d1357ddcfd89336b94444f77"
dependencies = [
"darling_core",
"quote",
@ -2173,11 +2173,11 @@ dependencies = [
[[package]]
name = "geographiclib-rs"
version = "0.2.3"
version = "0.2.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8ea804e7bd3c6a4ca6a01edfa35231557a8a81d4d3f3e1e2b650d028c42592be"
checksum = "e6e5ed84f8089c70234b0a8e0aedb6dc733671612ddc0d37c6066052f9781960"
dependencies = [
"lazy_static",
"libm",
]
[[package]]
@ -2225,7 +2225,7 @@ dependencies = [
"aho-corasick",
"bstr",
"log",
"regex-automata 0.4.3",
"regex-automata 0.4.5",
"regex-syntax 0.8.2",
]
@ -2252,7 +2252,7 @@ dependencies = [
"futures-sink",
"futures-util",
"http 0.2.11",
"indexmap 2.1.0",
"indexmap 2.2.2",
"slab",
"tokio",
"tokio-util",
@ -2271,19 +2271,13 @@ dependencies = [
"futures-sink",
"futures-util",
"http 1.0.0",
"indexmap 2.1.0",
"indexmap 2.2.2",
"slab",
"tokio",
"tokio-util",
"tracing",
]
[[package]]
name = "half"
version = "1.8.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "eabb4a44450da02c90444cf74558da904edde8fb4e9035a9a6a4e15445af0bd7"
[[package]]
name = "half"
version = "2.3.1"
@ -2367,9 +2361,9 @@ checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8"
[[package]]
name = "hermit-abi"
version = "0.3.4"
version = "0.3.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5d3d0e0f38255e7fa3cf31335b3a56f05febd18025f4db5ef7a0cfb4f8da651f"
checksum = "d0c62115964e08cb8039170eb33c1d0e2388a256930279edca206fff675f82c3"
[[package]]
name = "hex"
@ -2580,12 +2574,11 @@ dependencies = [
[[package]]
name = "hyper-util"
version = "0.1.2"
version = "0.1.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bdea9aac0dbe5a9240d68cfd9501e2db94222c6dc06843e06640b9e07f0fdc67"
checksum = "ca38ef113da30126bbff9cd1705f9273e15d45498615d138b0c20279ac7a76aa"
dependencies = [
"bytes",
"futures-channel",
"futures-util",
"http 1.0.0",
"http-body 1.0.0",
@ -2593,14 +2586,13 @@ dependencies = [
"pin-project-lite",
"socket2",
"tokio",
"tracing",
]
[[package]]
name = "iana-time-zone"
version = "0.1.59"
version = "0.1.60"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b6a67363e2aa4443928ce15e57ebae94fd8949958fd1223c4cfc0cd473ad7539"
checksum = "e7ffbb5a1b541ea2561f8c41c087286cc091e21e556a4f09a8f6cbf17b69b141"
dependencies = [
"android_system_properties",
"core-foundation-sys",
@ -2645,7 +2637,7 @@ dependencies = [
"globset",
"log",
"memchr",
"regex-automata 0.4.3",
"regex-automata 0.4.5",
"same-file",
"walkdir",
"winapi-util",
@ -2666,9 +2658,9 @@ dependencies = [
[[package]]
name = "imbl-sized-chunks"
version = "0.1.1"
version = "0.1.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e6957ea0b2541c5ca561d3ef4538044af79f8a05a1eb3a3b148936aaceaa1076"
checksum = "144006fb58ed787dcae3f54575ff4349755b00ccc99f4b4873860b654be1ed63"
dependencies = [
"bitmaps",
]
@ -2686,9 +2678,9 @@ dependencies = [
[[package]]
name = "indexmap"
version = "2.1.0"
version = "2.2.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d530e1a18b1cb4c484e6e34556a0d948706958449fca0cab753d649f2bce3d1f"
checksum = "824b2ae422412366ba479e8111fd301f7b5faece8149317bb81925979a53f520"
dependencies = [
"equivalent",
"hashbrown 0.14.3",
@ -2721,7 +2713,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "321f0f839cd44a4686e9504b0a62b4d69a50b62072144c71c68f5873c167b8d9"
dependencies = [
"ahash 0.8.7",
"indexmap 2.1.0",
"indexmap 2.2.2",
"is-terminal",
"itoa",
"log",
@ -2822,9 +2814,9 @@ dependencies = [
[[package]]
name = "js-sys"
version = "0.3.67"
version = "0.3.68"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9a1d36f1235bc969acba30b7f5990b864423a6068a10f7c90ae8f0112e3a59d1"
checksum = "406cda4b368d531c842222cf9d2600a9a4acce8d29423695379c6868a143a9ee"
dependencies = [
"wasm-bindgen",
]
@ -2893,9 +2885,9 @@ dependencies = [
[[package]]
name = "libc"
version = "0.2.152"
version = "0.2.153"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "13e3bf6590cbc649f4d1a3eefc9d5d6eb746f5200ffb04e5e142700b8faa56e7"
checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd"
[[package]]
name = "libloading"
@ -2978,9 +2970,9 @@ dependencies = [
[[package]]
name = "libz-sys"
version = "1.1.14"
version = "1.1.15"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "295c17e837573c8c821dbaeb3cceb3d745ad082f7572191409e69cbc1b3fd050"
checksum = "037731f5d3aaa87a5675e895b63ddff1a87624bc29f77004ea829809654e48f6"
dependencies = [
"cc",
"pkg-config",
@ -3079,9 +3071,9 @@ checksum = "523dc4f511e55ab87b694dc30d0f820d60906ef06413f93d4d7a1385599cc149"
[[package]]
name = "memmap2"
version = "0.9.3"
version = "0.9.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "45fd3a57831bf88bc63f8cebc0cf956116276e97fef3966103e96416209f7c92"
checksum = "fe751422e4a8caa417e13c3ea66452215d7d63e19e604f4980461212f3ae1322"
dependencies = [
"libc",
]
@ -3142,9 +3134,9 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
[[package]]
name = "miniz_oxide"
version = "0.7.1"
version = "0.7.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7"
checksum = "9d811f3e15f28568be3407c8e7fdb6514c1cda3cb30683f15b6a1a1dc4ea14a7"
dependencies = [
"adler",
]
@ -3297,13 +3289,19 @@ dependencies = [
[[package]]
name = "num-complex"
version = "0.4.4"
version = "0.4.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1ba157ca0885411de85d6ca030ba7e2a83a28636056c7c699b07c8b6f7383214"
checksum = "23c6602fda94a57c990fe0df199a035d83576b496aa29f4e634a8ac6004e68a6"
dependencies = [
"num-traits",
]
[[package]]
name = "num-conv"
version = "0.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9"
[[package]]
name = "num-format"
version = "0.4.4"
@ -3316,19 +3314,18 @@ dependencies = [
[[package]]
name = "num-integer"
version = "0.1.45"
version = "0.1.46"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9"
checksum = "7969661fd2958a5cb096e56c8e1ad0444ac2bbcd0061bd28660485a44879858f"
dependencies = [
"autocfg",
"num-traits",
]
[[package]]
name = "num-iter"
version = "0.1.43"
version = "0.1.44"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7d03e6c028c5dc5cac6e2dec0efda81fc887605bb3d884578bb6d6bf7514e252"
checksum = "d869c01cc0c455284163fd0092f1f93835385ccab5a98a0dcc497b2f8bf055a9"
dependencies = [
"autocfg",
"num-integer",
@ -3337,9 +3334,9 @@ dependencies = [
[[package]]
name = "num-traits"
version = "0.2.17"
version = "0.2.18"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c"
checksum = "da0df0e5185db44f69b44f26786fe401b6c293d1907744beaa7fa62b2e5a517a"
dependencies = [
"autocfg",
"libm",
@ -3399,9 +3396,9 @@ checksum = "0ab1bc2a289d34bd04a330323ac98a1b4bc82c9d9fcb1e66b63caa84da26b575"
[[package]]
name = "openssl"
version = "0.10.62"
version = "0.10.63"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8cde4d2d9200ad5909f8dac647e29482e07c3a35de8a13fce7c9c7747ad9f671"
checksum = "15c9d69dd87a29568d4d017cfe8ec518706046a05184e5aea92d0af890b803c8"
dependencies = [
"bitflags 2.4.2",
"cfg-if",
@ -3431,9 +3428,9 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf"
[[package]]
name = "openssl-sys"
version = "0.9.98"
version = "0.9.99"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c1665caf8ab2dc9aef43d1c0023bd904633a6a05cb30b0ad59bec2ae986e57a7"
checksum = "22e1bf214306098e4832460f797824c05d25aacdf896f64a985fb0fd992454ae"
dependencies = [
"cc",
"libc",
@ -3527,7 +3524,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "889dca4c98efa21b1ba54ddb2bde44fd4920d910f492b618351f839d8428d79d"
dependencies = [
"flate2",
"half 2.3.1",
"half",
"lazy_static",
"libc",
"libloading 0.7.4",
@ -3659,7 +3656,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e1d3afd2628e69da2be385eb6f2fd57c8ac7977ceeff6dc166ff1657b0e386a9"
dependencies = [
"fixedbitset",
"indexmap 2.1.0",
"indexmap 2.2.2",
]
[[package]]
@ -3733,18 +3730,18 @@ checksum = "5be167a7af36ee22fe3115051bc51f6e6c7054c9348e28deb4f49bd6f705a315"
[[package]]
name = "pin-project"
version = "1.1.3"
version = "1.1.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fda4ed1c6c173e3fc7a83629421152e01d7b1f9b7f65fb301e490e8cfc656422"
checksum = "0302c4a0442c456bd56f841aee5c3bfd17967563f6fadc9ceb9f9c23cf3807e0"
dependencies = [
"pin-project-internal",
]
[[package]]
name = "pin-project-internal"
version = "1.1.3"
version = "1.1.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405"
checksum = "266c042b60c9c76b8d53061e52b2e0d1116abc57cefc8c5cd671619a56ac3690"
dependencies = [
"proc-macro2",
"quote",
@ -3911,7 +3908,7 @@ version = "3.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6d37c51ca738a55da99dc0c4a34860fd675453b8b36209178c2249bb13651284"
dependencies = [
"toml_edit 0.21.0",
"toml_edit 0.21.1",
]
[[package]]
@ -3940,9 +3937,9 @@ dependencies = [
[[package]]
name = "proc-macro2"
version = "1.0.76"
version = "1.0.78"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "95fc56cda0b5c3325f5fbbd7ff9fda9e02bb00bb3dac51252d2f1bfa1cb8cc8c"
checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae"
dependencies = [
"unicode-ident",
]
@ -4030,9 +4027,9 @@ dependencies = [
[[package]]
name = "quick_cache"
version = "0.4.0"
version = "0.4.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f69f8d22fa3f34f3083d9a4375c038732c7a7e964de1beb81c544da92dfc40b8"
checksum = "58c20af3800cee5134b79a3bd4a3d4b583c16ccfa5f53338f46400851a5b3819"
dependencies = [
"ahash 0.8.7",
"equivalent",
@ -4226,13 +4223,13 @@ dependencies = [
[[package]]
name = "regex"
version = "1.10.2"
version = "1.10.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "380b951a9c5e80ddfd6136919eef32310721aa4aacd4889a8d39124b026ab343"
checksum = "b62dbe01f0b06f9d8dc7d49e05a0785f153b00b2c227856282f671e0318c9b15"
dependencies = [
"aho-corasick",
"memchr",
"regex-automata 0.4.3",
"regex-automata 0.4.5",
"regex-syntax 0.8.2",
]
@ -4247,9 +4244,9 @@ dependencies = [
[[package]]
name = "regex-automata"
version = "0.4.3"
version = "0.4.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5f804c7828047e88b2d32e2d7fe5a105da8ee3264f01902f796c8e067dc2483f"
checksum = "5bb987efffd3c6d0d8f5f89510bb458559eab11e4f869acb20bf845e016259cd"
dependencies = [
"aho-corasick",
"memchr",
@ -4285,18 +4282,18 @@ checksum = "e898588f33fdd5b9420719948f9f2a32c922a246964576f71ba7f24f80610fbc"
[[package]]
name = "rend"
version = "0.4.1"
version = "0.4.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a2571463863a6bd50c32f94402933f03457a3fbaf697a707c5be741e459f08fd"
checksum = "71fe3824f5629716b1589be05dacd749f6aa084c87e00e016714a8cdfccc997c"
dependencies = [
"bytecheck",
]
[[package]]
name = "reqwest"
version = "0.11.23"
version = "0.11.24"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "37b1ae8d9ac08420c66222fb9096fc5de435c3c48542bc5336c51892cffafb41"
checksum = "c6920094eb85afde5e4a138be3f2de8bbdf28000f0029e72c45025a56b042251"
dependencies = [
"async-compression",
"base64 0.21.7",
@ -4324,6 +4321,7 @@ dependencies = [
"serde",
"serde_json",
"serde_urlencoded",
"sync_wrapper",
"system-configuration",
"tokio",
"tokio-native-tls",
@ -4431,9 +4429,9 @@ dependencies = [
[[package]]
name = "rkyv"
version = "0.7.43"
version = "0.7.44"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "527a97cdfef66f65998b5f3b637c26f5a5ec09cc52a3f9932313ac645f4190f5"
checksum = "5cba464629b3394fc4dbc6f940ff8f5b4ff5c7aef40f29166fd4ad12acbc99c0"
dependencies = [
"bitvec",
"bytecheck",
@ -4449,9 +4447,9 @@ dependencies = [
[[package]]
name = "rkyv_derive"
version = "0.7.43"
version = "0.7.44"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b5c462a1328c8e67e4d6dbad1eb0355dd43e8ab432c6e227a43657f16ade5033"
checksum = "a7dddfff8de25e6f62b9d64e6e432bf1c6736c57d20323e15ee10435fbda7c65"
dependencies = [
"proc-macro2",
"quote",
@ -4548,7 +4546,7 @@ dependencies = [
"convert_case 0.6.0",
"fnv",
"ident_case",
"indexmap 2.1.0",
"indexmap 2.2.2",
"proc-macro-crate 1.3.1",
"proc-macro-error",
"proc-macro2",
@ -4610,9 +4608,9 @@ dependencies = [
[[package]]
name = "rust_decimal"
version = "1.33.1"
version = "1.34.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "06676aec5ccb8fc1da723cc8c0f9a46549f21ebb8753d3915c6c41db1e7f1dc4"
checksum = "755392e1a2f77afd95580d3f0d0e94ac83eeeb7167552c9b5bca549e61a94d83"
dependencies = [
"arbitrary",
"arrayvec",
@ -4657,9 +4655,9 @@ dependencies = [
[[package]]
name = "rustix"
version = "0.38.30"
version = "0.38.31"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "322394588aaf33c24007e8bb3238ee3e4c5c09c084ab32bc73890b99ff326bca"
checksum = "6ea3e1a662af26cd7a3ba09c0297a31af215563ecf42817c98df621387f4e949"
dependencies = [
"bitflags 2.4.2",
"errno",
@ -4876,12 +4874,12 @@ dependencies = [
[[package]]
name = "serde_html_form"
version = "0.2.3"
version = "0.2.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "224e6a14f315852940f3ec103125aa6482f0e224732ed91ed3330ed633077c34"
checksum = "20e1066e1cfa6692a722cf40386a2caec36da5ddc4a2c16df592f0f609677e8c"
dependencies = [
"form_urlencoded",
"indexmap 2.1.0",
"indexmap 2.2.2",
"itoa",
"ryu",
"serde",
@ -4893,7 +4891,7 @@ version = "1.0.108"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3d1c7e3eac408d115102c4c24ad393e0821bb3a5df4d506a80f85f7a742a526b"
dependencies = [
"indexmap 2.1.0",
"indexmap 2.2.2",
"itoa",
"ryu",
"serde",
@ -4942,7 +4940,7 @@ dependencies = [
"chrono",
"hex",
"indexmap 1.9.3",
"indexmap 2.1.0",
"indexmap 2.2.2",
"serde",
"serde_json",
"serde_with_macros",
@ -5077,9 +5075,9 @@ dependencies = [
[[package]]
name = "smallvec"
version = "1.12.0"
version = "1.13.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2593d31f82ead8df961d8bd23a64c2ccf2eb5dd34b0a34bfb4dd54011c72009e"
checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7"
[[package]]
name = "smol_str"
@ -5322,7 +5320,7 @@ dependencies = [
"futures",
"futures-concurrency",
"geo 0.27.0",
"indexmap 2.1.0",
"indexmap 2.2.2",
"native-tls",
"once_cell",
"path-clean",
@ -5428,7 +5426,8 @@ dependencies = [
"surrealdb-derive",
"surrealdb-jsonwebtoken",
"surrealdb-tikv-client",
"surrealml-core",
"surrealml-core 0.0.7",
"surrealml-core 0.0.8",
"temp-dir",
"test-log",
"thiserror",
@ -5519,6 +5518,21 @@ dependencies = [
"regex",
]
[[package]]
name = "surrealml-core"
version = "0.0.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "12c54e2e688e15c48e3bd26824311c5143b17028391733f88862f162f70dd4ca"
dependencies = [
"bytes",
"futures-core",
"futures-util",
"ndarray",
"once_cell",
"ort",
"regex",
]
[[package]]
name = "symbolic-common"
version = "12.8.0"
@ -5638,13 +5652,12 @@ dependencies = [
[[package]]
name = "tempfile"
version = "3.9.0"
version = "3.10.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "01ce4141aa927a6d1bd34a041795abd0db1cccba5d5f24b009f694bdf3a1f3fa"
checksum = "a365e8cd18e44762ef95d87f284f4b5cd04107fec2ff3052bd6a3e6069669e67"
dependencies = [
"cfg-if",
"fastrand 2.0.1",
"redox_syscall",
"rustix",
"windows-sys 0.52.0",
]
@ -5739,12 +5752,13 @@ dependencies = [
[[package]]
name = "time"
version = "0.3.31"
version = "0.3.34"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f657ba42c3f86e7680e53c8cd3af8abbe56b5491790b46e22e19c0d57463583e"
checksum = "c8248b6521bb14bc45b4067159b9b6ad792e2d6d754d6c41fb50e29fefe38749"
dependencies = [
"deranged",
"itoa",
"num-conv",
"powerfmt",
"serde",
"time-core",
@ -5759,10 +5773,11 @@ checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3"
[[package]]
name = "time-macros"
version = "0.2.16"
version = "0.2.17"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "26197e33420244aeb70c3e8c78376ca46571bc4e701e4791c2cd9f57dcb3a43f"
checksum = "7ba3a3ef41e6672a2f0f001392bb5dcd3ff0a9992d618ca761a11c3121547774"
dependencies = [
"num-conv",
"time-core",
]
@ -5802,9 +5817,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
[[package]]
name = "tokio"
version = "1.35.1"
version = "1.36.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c89b4efa943be685f629b149f53829423f8f5531ea21249408e8e2f8671ec104"
checksum = "61285f6515fa018fb2d1e46eb21223fff441ee8db5d0f1435e8ab4f5cdb80931"
dependencies = [
"backtrace",
"bytes",
@ -5915,18 +5930,18 @@ version = "0.19.15"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421"
dependencies = [
"indexmap 2.1.0",
"indexmap 2.2.2",
"toml_datetime",
"winnow",
]
[[package]]
name = "toml_edit"
version = "0.21.0"
version = "0.21.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d34d383cd00a163b4a5b85053df514d45bc330f6de7737edfe0a93311d1eaa03"
checksum = "6a8534fd7f78b5405e860340ad6575217ce99f38d4d5c8f2442cb5ecb50090e1"
dependencies = [
"indexmap 2.1.0",
"indexmap 2.2.2",
"toml_datetime",
"winnow",
]
@ -6201,12 +6216,14 @@ checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825"
[[package]]
name = "ulid"
version = "1.1.0"
version = "1.1.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7e37c4b6cbcc59a8dcd09a6429fbc7890286bcbb79215cea7b38a3c4c0921d93"
checksum = "34778c17965aa2a08913b57e1f34db9b4a63f5de31768b55bf20d2795f921259"
dependencies = [
"getrandom 0.2.12",
"rand 0.8.5",
"serde",
"web-time",
]
[[package]]
@ -6257,9 +6274,9 @@ dependencies = [
[[package]]
name = "unicode-segmentation"
version = "1.10.1"
version = "1.11.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36"
checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202"
[[package]]
name = "unicode-width"
@ -6332,9 +6349,9 @@ checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a"
[[package]]
name = "uuid"
version = "1.6.1"
version = "1.7.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5e395fcf16a7a3d8127ec99782007af141946b4795001f876d54fb0d55978560"
checksum = "f00cc9702ca12d3c81455259621e676d0f7251cec66a21e98fe2e9a37db93b2a"
dependencies = [
"arbitrary",
"atomic",
@ -6420,9 +6437,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
[[package]]
name = "wasm-bindgen"
version = "0.2.90"
version = "0.2.91"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b1223296a201415c7fad14792dbefaace9bd52b62d33453ade1c5b5f07555406"
checksum = "c1e124130aee3fb58c5bdd6b639a0509486b0338acaaae0c84a5124b0f588b7f"
dependencies = [
"cfg-if",
"wasm-bindgen-macro",
@ -6430,9 +6447,9 @@ dependencies = [
[[package]]
name = "wasm-bindgen-backend"
version = "0.2.90"
version = "0.2.91"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fcdc935b63408d58a32f8cc9738a0bffd8f05cc7c002086c6ef20b7312ad9dcd"
checksum = "c9e7e1900c352b609c8488ad12639a311045f40a35491fb69ba8c12f758af70b"
dependencies = [
"bumpalo",
"log",
@ -6445,9 +6462,9 @@ dependencies = [
[[package]]
name = "wasm-bindgen-futures"
version = "0.4.40"
version = "0.4.41"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bde2032aeb86bdfaecc8b261eef3cba735cc426c1f3a3416d1e0791be95fc461"
checksum = "877b9c3f61ceea0e56331985743b13f3d25c406a7098d45180fb5f09bc19ed97"
dependencies = [
"cfg-if",
"js-sys",
@ -6457,9 +6474,9 @@ dependencies = [
[[package]]
name = "wasm-bindgen-macro"
version = "0.2.90"
version = "0.2.91"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3e4c238561b2d428924c49815533a8b9121c664599558a5d9ec51f8a1740a999"
checksum = "b30af9e2d358182b5c7449424f017eba305ed32a7010509ede96cdc4696c46ed"
dependencies = [
"quote",
"wasm-bindgen-macro-support",
@ -6467,9 +6484,9 @@ dependencies = [
[[package]]
name = "wasm-bindgen-macro-support"
version = "0.2.90"
version = "0.2.91"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bae1abb6806dc1ad9e560ed242107c0f6c84335f1749dd4e8ddb012ebd5e25a7"
checksum = "642f325be6301eb8107a83d12a8ac6c1e1c54345a7ef1a9261962dfefda09e66"
dependencies = [
"proc-macro2",
"quote",
@ -6480,15 +6497,15 @@ dependencies = [
[[package]]
name = "wasm-bindgen-shared"
version = "0.2.90"
version = "0.2.91"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4d91413b1c31d7539ba5ef2451af3f0b833a005eb27a631cec32bc0635a8602b"
checksum = "4f186bd2dcf04330886ce82d6f33dd75a7bfcf69ecf5763b89fcde53b6ac9838"
[[package]]
name = "wasm-streams"
version = "0.3.0"
version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b4609d447824375f43e1ffbc051b50ad8f4b3ae8219680c94452ea05eb240ac7"
checksum = "b65dc4c90b63b118468cf747d8bf3566c1913ef60be765b5730ead9e0a3ba129"
dependencies = [
"futures-util",
"js-sys",
@ -6512,9 +6529,19 @@ dependencies = [
[[package]]
name = "web-sys"
version = "0.3.67"
version = "0.3.68"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "58cd2333b6e0be7a39605f0e255892fd7418a682d8da8fe042fe25128794d2ed"
checksum = "96565907687f7aceb35bc5fc03770a8a0471d82e479f25832f54a0e3f4b28446"
dependencies = [
"js-sys",
"wasm-bindgen",
]
[[package]]
name = "web-time"
version = "1.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2ee269d72cc29bf77a2c4bc689cc750fb39f5cbd493d2205bbb3f5c7779cf7b0"
dependencies = [
"js-sys",
"wasm-bindgen",
@ -6522,9 +6549,9 @@ dependencies = [
[[package]]
name = "webpki-roots"
version = "0.25.3"
version = "0.25.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1778a42e8b3b90bff8d0f5032bf22250792889a5cdc752aa0020c84abe3aaf10"
checksum = "5f20c57d8d7db6d3b86154206ae5d8fba62dd39573114de97c2cb0578251f8e1"
[[package]]
name = "which"
@ -6712,9 +6739,9 @@ checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04"
[[package]]
name = "winnow"
version = "0.5.34"
version = "0.5.39"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b7cf47b659b318dccbd69cc4797a39ae128f533dce7902a1096044d1967b9c16"
checksum = "5389a154b01683d28c77f8f68f49dea75f0a4da32557a58f68ee51ebba472d29"
dependencies = [
"memchr",
]

1
Cargo.toml
View file

@ -18,6 +18,7 @@ scripting = ["surrealdb/scripting"]
http = ["surrealdb/http"]
http-compression = []
ml = ["surrealdb/ml"]
ml2 = ["surrealdb/ml2"]
jwks = ["surrealdb/jwks"]
sql2 = ["surrealdb/sql2"]
parser2 = ["surrealdb/parser2"]

6
cackle.toml
View file

@ -81,12 +81,6 @@ build.allow_build_instructions = [
]
allow_unsafe = true
[pkg.lru]
allow_unsafe = true
allow_apis = [
"net",
]
[pkg.bzip2-sys]
build.allow_apis = [
"fs",

6
core/Cargo.toml
View file

@ -39,7 +39,8 @@ kv-fdb-7_0 = ["foundationdb/fdb-7_0", "kv-fdb"]
kv-fdb-7_1 = ["foundationdb/fdb-7_1", "kv-fdb"]
scripting = ["dep:js"]
http = ["dep:reqwest"]
ml = ["dep:surrealml-core", "dep:ndarray"]
ml = ["dep:ml1", "dep:ndarray"]
ml2 = ["dep:ml2", "dep:ndarray"]
jwks = ["dep:reqwest", "sql2"]
arbitrary = [
"dep:arbitrary",
@ -135,7 +136,8 @@ sha2 = "0.10.8"
snap = "1.1.0"
speedb = { version = "0.0.4", features = ["lz4", "snappy"], optional = true }
storekey = "0.5.0"
surrealml-core = { version = "0.0.7", optional = true }
ml1 = { version = "0.0.7", optional = true, package = "surrealml-core" }
ml2 = { version = "0.0.8", optional = true, package = "surrealml-core" }
thiserror = "1.0.50"
tikv = { version = "0.2.0-surreal.2", default-features = false, package = "surrealdb-tikv-client", optional = true }
tracing = "0.1.40"

11
core/src/lib.rs
View file

@ -33,7 +33,7 @@ pub mod idx;
pub mod key;
#[doc(hidden)]
pub mod kvs;
#[cfg(any(feature = "ml", feature = "jwks"))]
#[cfg(any(feature = "ml", feature = "ml2", feature = "jwks"))]
#[doc(hidden)]
pub mod obs;
#[doc(hidden)]
@ -48,7 +48,12 @@ pub mod channel {
pub use channel::Sender;
}
#[cfg(feature = "ml")]
#[cfg(all(feature = "ml", not(feature = "ml2")))]
#[cfg(not(target_arch = "wasm32"))]
#[doc(hidden)]
pub use surrealml_core as ml;
pub use ml1 as ml;
#[cfg(feature = "ml2")]
#[cfg(not(target_arch = "wasm32"))]
#[doc(hidden)]
pub use ml2 as ml;

22
core/src/sql/v1/model.rs
View file

@ -8,20 +8,20 @@ use revision::revisioned;
use serde::{Deserialize, Serialize};
use std::fmt;
#[cfg(feature = "ml")]
#[cfg(any(feature = "ml", feature = "ml2"))]
use crate::iam::Action;
#[cfg(feature = "ml")]
#[cfg(any(feature = "ml", feature = "ml2"))]
use crate::ml::execution::compute::ModelComputation;
#[cfg(any(feature = "ml", feature = "ml2"))]
use crate::ml::storage::surml_file::SurMlFile;
#[cfg(any(feature = "ml", feature = "ml2"))]
use crate::sql::Permission;
#[cfg(feature = "ml")]
#[cfg(any(feature = "ml", feature = "ml2"))]
use futures::future::try_join_all;
#[cfg(feature = "ml")]
#[cfg(any(feature = "ml", feature = "ml2"))]
use std::collections::HashMap;
#[cfg(feature = "ml")]
use surrealml_core::execution::compute::ModelComputation;
#[cfg(feature = "ml")]
use surrealml_core::storage::surml_file::SurMlFile;
#[cfg(feature = "ml")]
#[cfg(any(feature = "ml", feature = "ml2"))]
const ARGUMENTS: &str = "The model expects 1 argument. The argument can be either a number, an object, or an array of numbers.";
#[derive(Clone, Debug, Default, PartialEq, PartialOrd, Serialize, Deserialize, Store, Hash)]
@ -47,7 +47,7 @@ impl fmt::Display for Model {
}
impl Model {
#[cfg(feature = "ml")]
#[cfg(any(feature = "ml", feature = "ml2"))]
pub(crate) async fn compute(
&self,
ctx: &Context<'_>,
@ -196,7 +196,7 @@ impl Model {
}
}
#[cfg(not(feature = "ml"))]
#[cfg(not(any(feature = "ml", feature = "ml2")))]
pub(crate) async fn compute(
&self,
_ctx: &Context<'_>,

22
core/src/sql/v2/model.rs
View file

@ -8,20 +8,20 @@ use revision::revisioned;
use serde::{Deserialize, Serialize};
use std::fmt;
#[cfg(feature = "ml")]
#[cfg(any(feature = "ml", feature = "ml2"))]
use crate::iam::Action;
#[cfg(feature = "ml")]
#[cfg(any(feature = "ml", feature = "ml2"))]
use crate::ml::execution::compute::ModelComputation;
#[cfg(any(feature = "ml", feature = "ml2"))]
use crate::ml::storage::surml_file::SurMlFile;
#[cfg(any(feature = "ml", feature = "ml2"))]
use crate::sql::Permission;
#[cfg(feature = "ml")]
#[cfg(any(feature = "ml", feature = "ml2"))]
use futures::future::try_join_all;
#[cfg(feature = "ml")]
#[cfg(any(feature = "ml", feature = "ml2"))]
use std::collections::HashMap;
#[cfg(feature = "ml")]
use surrealml_core::execution::compute::ModelComputation;
#[cfg(feature = "ml")]
use surrealml_core::storage::surml_file::SurMlFile;
#[cfg(feature = "ml")]
#[cfg(any(feature = "ml", feature = "ml2"))]
const ARGUMENTS: &str = "The model expects 1 argument. The argument can be either a number, an object, or an array of numbers.";
#[derive(Clone, Debug, Default, PartialEq, PartialOrd, Serialize, Deserialize, Store, Hash)]
@ -47,7 +47,7 @@ impl fmt::Display for Model {
}
impl Model {
#[cfg(feature = "ml")]
#[cfg(any(feature = "ml", feature = "ml2"))]
pub(crate) async fn compute(
&self,
ctx: &Context<'_>,
@ -196,7 +196,7 @@ impl Model {
}
}
#[cfg(not(feature = "ml"))]
#[cfg(not(any(feature = "ml", feature = "ml2")))]
pub(crate) async fn compute(
&self,
_ctx: &Context<'_>,

1
lib/Cargo.toml
View file

@ -52,6 +52,7 @@ rustls = [
"tokio-tungstenite?/rustls-tls-webpki-roots",
]
ml = ["surrealdb-core/ml"]
ml2 = ["surrealdb-core/ml2"]
jwks = ["surrealdb-core/jwks"]
arbitrary = ["surrealdb-core/arbitrary"]
sql2 = ["surrealdb-core/sql2"]

22
lib/src/api/engine/local/mod.rs
View file

@ -46,28 +46,28 @@ use crate::api::Surreal;
use crate::dbs::Notification;
use crate::dbs::Response;
use crate::dbs::Session;
#[cfg(feature = "ml")]
#[cfg(any(feature = "ml", feature = "ml2"))]
#[cfg(not(target_arch = "wasm32"))]
use crate::iam::check::check_ns_db;
#[cfg(feature = "ml")]
#[cfg(any(feature = "ml", feature = "ml2"))]
#[cfg(not(target_arch = "wasm32"))]
use crate::iam::Action;
#[cfg(feature = "ml")]
#[cfg(any(feature = "ml", feature = "ml2"))]
#[cfg(not(target_arch = "wasm32"))]
use crate::iam::ResourceKind;
use crate::kvs::Datastore;
#[cfg(feature = "ml")]
#[cfg(any(feature = "ml", feature = "ml2"))]
#[cfg(not(target_arch = "wasm32"))]
use crate::kvs::{LockType, TransactionType};
use crate::method::Stats;
#[cfg(feature = "ml")]
#[cfg(any(feature = "ml", feature = "ml2"))]
#[cfg(not(target_arch = "wasm32"))]
use crate::ml::storage::surml_file::SurMlFile;
use crate::opt::IntoEndpoint;
#[cfg(feature = "ml")]
#[cfg(any(feature = "ml", feature = "ml2"))]
#[cfg(not(target_arch = "wasm32"))]
use crate::sql::statements::DefineModelStatement;
#[cfg(feature = "ml")]
#[cfg(any(feature = "ml", feature = "ml2"))]
#[cfg(not(target_arch = "wasm32"))]
use crate::sql::statements::DefineStatement;
use crate::sql::statements::KillStatement;
@ -79,7 +79,7 @@ use crate::sql::Strand;
use crate::sql::Uuid;
use crate::sql::Value;
use channel::Sender;
#[cfg(feature = "ml")]
#[cfg(any(feature = "ml", feature = "ml2"))]
#[cfg(not(target_arch = "wasm32"))]
use futures::StreamExt;
use indexmap::IndexMap;
@ -410,7 +410,7 @@ fn process(responses: Vec<Response>) -> QueryResponse {
}
async fn take(one: bool, responses: Vec<Response>) -> Result<Value> {
if let Some((_stats, result)) = process(responses).results.remove(&0) {
if let Some((_stats, result)) = process(responses).results.swap_remove(&0) {
let value = result?;
match one {
true => match value {
@ -439,7 +439,7 @@ async fn export(
ml_config: Option<MlConfig>,
) -> Result<()> {
match ml_config {
#[cfg(feature = "ml")]
#[cfg(any(feature = "ml", feature = "ml2"))]
Some(MlConfig::Export {
name,
version,
@ -701,7 +701,7 @@ async fn router(
}
};
let responses = match param.ml_config {
#[cfg(feature = "ml")]
#[cfg(any(feature = "ml", feature = "ml2"))]
Some(MlConfig::Import) => {
// Ensure a NS and DB are set
let (nsv, dbv) = check_ns_db(session)?;

10
lib/src/api/engine/remote/http/mod.rs
View file

@ -7,7 +7,7 @@ pub(crate) mod wasm;
use crate::api::conn::DbResponse;
use crate::api::conn::Method;
#[cfg(feature = "ml")]
#[cfg(any(feature = "ml", feature = "ml2"))]
#[cfg(not(target_arch = "wasm32"))]
use crate::api::conn::MlConfig;
use crate::api::conn::Param;
@ -218,7 +218,7 @@ async fn query(request: RequestBuilder) -> Result<QueryResponse> {
}
async fn take(one: bool, request: RequestBuilder) -> Result<Value> {
if let Some((_stats, result)) = query(request).await?.results.remove(&0) {
if let Some((_stats, result)) = query(request).await?.results.swap_remove(&0) {
let value = result?;
match one {
true => match value {
@ -524,7 +524,7 @@ async fn router(
#[cfg(not(target_arch = "wasm32"))]
Method::Export => {
let path = match param.ml_config {
#[cfg(feature = "ml")]
#[cfg(any(feature = "ml", feature = "ml2"))]
Some(MlConfig::Export {
name,
version,
@ -542,7 +542,7 @@ async fn router(
#[cfg(not(target_arch = "wasm32"))]
Method::Import => {
let path = match param.ml_config {
#[cfg(feature = "ml")]
#[cfg(any(feature = "ml", feature = "ml2"))]
Some(MlConfig::Import) => base_url.join("ml/import")?,
_ => base_url.join(Method::Import.as_str())?,
};
@ -585,7 +585,7 @@ async fn router(
}
Method::Unset => {
if let [Value::Strand(Strand(key))] = &params[..1] {
vars.remove(key);
vars.swap_remove(key);
}
Ok(DbResponse::Other(Value::None))
}

4
lib/src/api/engine/remote/ws/native.rs
View file

@ -233,7 +233,7 @@ pub(crate) fn router(
}
Method::Unset => {
if let [Value::Strand(Strand(key))] = &params[..1] {
vars.remove(key);
vars.swap_remove(key);
}
}
Method::Live => {
@ -331,7 +331,7 @@ pub(crate) fn router(
{
if matches!(method, Method::Set) {
if let Some((key, value)) =
var_stash.remove(&id)
var_stash.swap_remove(&id)
{
vars.insert(key, value);
}

4
lib/src/api/engine/remote/ws/wasm.rs
View file

@ -207,7 +207,7 @@ pub(crate) fn router(
}
Method::Unset => {
if let [Value::Strand(Strand(key))] = &params[..1] {
vars.remove(key);
vars.swap_remove(key);
}
}
Method::Live => {
@ -300,7 +300,7 @@ pub(crate) fn router(
if let Some((method, sender)) = routes.remove(&id) {
if matches!(method, Method::Set) {
if let Some((key, value)) =
var_stash.remove(&id)
var_stash.swap_remove(&id)
{
vars.insert(key, value);
}

8
lib/src/api/method/query.rs
View file

@ -420,7 +420,7 @@ impl Response {
}
let mut errors = HashMap::with_capacity(keys.len());
for key in keys {
if let Some((_, Err(error))) = self.results.remove(&key) {
if let Some((_, Err(error))) = self.results.swap_remove(&key) {
errors.insert(key, error);
}
}
@ -451,7 +451,7 @@ impl Response {
}
}
if let Some(key) = first_error {
if let Some((_, Err(error))) = self.results.remove(&key) {
if let Some((_, Err(error))) = self.results.swap_remove(&key) {
return Err(error);
}
}
@ -579,7 +579,7 @@ impl WithStats<Response> {
}
let mut errors = HashMap::with_capacity(keys.len());
for key in keys {
if let Some((stats, Err(error))) = self.0.results.remove(&key) {
if let Some((stats, Err(error))) = self.0.results.swap_remove(&key) {
errors.insert(key, (stats, error));
}
}
@ -880,7 +880,7 @@ mod tests {
else {
panic!("silently dropping records not allowed");
};
let records = map.remove(&0).unwrap().1.unwrap();
let records = map.swap_remove(&0).unwrap().1.unwrap();
assert_eq!(records, vec![true, false].into());
}

32
lib/src/api/opt/query.rs
View file

@ -190,7 +190,7 @@ where
impl QueryResult<Value> for usize {
fn query_result(self, response: &mut QueryResponse) -> Result<Value> {
match response.results.remove(&self) {
match response.results.swap_remove(&self) {
Some((_, result)) => Ok(result?),
None => Ok(Value::None),
}
@ -211,7 +211,7 @@ where
Ok(val) => val,
Err(error) => {
let error = mem::replace(error, Error::ConnectionUninitialised.into());
response.results.remove(&self);
response.results.swap_remove(&self);
return Err(error);
}
},
@ -238,7 +238,7 @@ where
from_value(value).map_err(Into::into)
}
};
response.results.remove(&self);
response.results.swap_remove(&self);
result
}
@ -255,7 +255,7 @@ impl QueryResult<Value> for (usize, &str) {
Ok(val) => val,
Err(error) => {
let error = mem::replace(error, Error::ConnectionUninitialised.into());
response.results.remove(&index);
response.results.swap_remove(&index);
return Err(error);
}
},
@ -288,7 +288,7 @@ where
Ok(val) => val,
Err(error) => {
let error = mem::replace(error, Error::ConnectionUninitialised.into());
response.results.remove(&index);
response.results.swap_remove(&index);
return Err(error);
}
},
@ -299,7 +299,7 @@ where
let value = match value {
Value::Array(Array(vec)) => match &mut vec[..] {
[] => {
response.results.remove(&index);
response.results.swap_remove(&index);
return Ok(None);
}
[value] => value,
@ -316,12 +316,12 @@ where
};
match value {
Value::None | Value::Null => {
response.results.remove(&index);
response.results.swap_remove(&index);
Ok(None)
}
Value::Object(Object(object)) => {
if object.is_empty() {
response.results.remove(&index);
response.results.swap_remove(&index);
return Ok(None);
}
let Some(value) = object.remove(key) else {
@ -343,7 +343,7 @@ where
T: DeserializeOwned,
{
fn query_result(self, response: &mut QueryResponse) -> Result<Vec<T>> {
let vec = match response.results.remove(&self) {
let vec = match response.results.swap_remove(&self) {
Some((_, result)) => match result? {
Value::Array(Array(vec)) => vec,
vec => vec![vec],
@ -377,7 +377,7 @@ where
},
Err(error) => {
let error = mem::replace(error, Error::ConnectionUninitialised.into());
response.results.remove(&index);
response.results.swap_remove(&index);
return Err(error);
}
},
@ -435,10 +435,10 @@ impl QueryStream<Value> for usize {
fn query_stream(self, response: &mut QueryResponse) -> Result<method::QueryStream<Value>> {
let stream = response
.live_queries
.remove(&self)
.swap_remove(&self)
.and_then(|result| match result {
Err(crate::Error::Api(Error::NotLiveQuery(..))) => {
response.results.remove(&self).and_then(|x| x.1.err().map(Err))
response.results.swap_remove(&self).and_then(|x| x.1.err().map(Err))
}
result => Some(result),
})
@ -456,7 +456,7 @@ impl QueryStream<Value> for () {
for (index, result) in mem::take(&mut response.live_queries) {
match result {
Ok(stream) => streams.push(stream),
Err(crate::Error::Api(Error::NotLiveQuery(..))) => match response.results.remove(&index) {
Err(crate::Error::Api(Error::NotLiveQuery(..))) => match response.results.swap_remove(&index) {
Some((stats, Err(error))) => {
response.results.insert(index, (stats, Err(Error::ResponseAlreadyTaken.into())));
return Err(error);
@ -481,10 +481,10 @@ where
) -> Result<method::QueryStream<Notification<R>>> {
let mut stream = response
.live_queries
.remove(&self)
.swap_remove(&self)
.and_then(|result| match result {
Err(crate::Error::Api(Error::NotLiveQuery(..))) => {
response.results.remove(&self).and_then(|x| x.1.err().map(Err))
response.results.swap_remove(&self).and_then(|x| x.1.err().map(Err))
}
result => Some(result),
})
@ -514,7 +514,7 @@ where
for (index, result) in mem::take(&mut response.live_queries) {
let mut stream = match result {
Ok(stream) => stream,
Err(crate::Error::Api(Error::NotLiveQuery(..))) => match response.results.remove(&index) {
Err(crate::Error::Api(Error::NotLiveQuery(..))) => match response.results.swap_remove(&index) {
Some((stats, Err(error))) => {
response.results.insert(index, (stats, Err(Error::ResponseAlreadyTaken.into())));
return Err(error);

14
lib/src/lib.rs
View file

@ -101,11 +101,21 @@
#![cfg_attr(test, deny(warnings))]
#[cfg(all(not(surrealdb_unstable), feature = "parser2"))]
compile_error!("\"parser2\" is currently unstable. You need to enable the `surrealdb_unstable` flag to use it.");
compile_error!(
"`parser2` is currently unstable. You need to enable the `surrealdb_unstable` flag to use it."
);
#[cfg(all(not(surrealdb_unstable), feature = "ml2"))]
compile_error!(
"`ml2` is currently unstable. You need to enable the `surrealdb_unstable` flag to use it."
);
#[cfg(all(not(surrealdb_unstable), feature = "jwks"))]
compile_error!("`jwks` depends on a currently unstable feature, `sql2`. You need to enable the `surrealdb_unstable` flag to use it.");
#[cfg(all(not(surrealdb_unstable), feature = "sql2"))]
compile_error!(
"\"sql2\" is currently unstable. You need to enable the `surrealdb_unstable` flag to use it."
"`sql2` is currently unstable. You need to enable the `surrealdb_unstable` flag to use it."
);
#[macro_use]

2
lib/tests/api/backup.rs
View file

@ -31,7 +31,7 @@ async fn export_import() {
}
#[test_log::test(tokio::test)]
#[cfg(feature = "ml")]
#[cfg(any(feature = "ml", feature = "ml2"))]
async fn ml_export_import() {
let (permit, db) = new_db().await;
let db_name = Ulid::new().to_string();

4
src/net/mod.rs
View file

@ -17,7 +17,7 @@ mod sync;
mod tracer;
mod version;
#[cfg(feature = "ml")]
#[cfg(any(feature = "ml", feature = "ml2"))]
mod ml;
use crate::cli::CF;
@ -166,7 +166,7 @@ pub async fn init(ct: CancellationToken) -> Result<(), Error> {
.merge(signup::router())
.merge(key::router());
#[cfg(feature = "ml")]
#[cfg(any(feature = "ml", feature = "ml2"))]
let axum_app = axum_app.merge(ml::router());
let axum_app = axum_app.layer(service);

180
supply-chain/config.toml
View file

@ -32,11 +32,11 @@ audit-as-crates-io = true
audit-as-crates-io = true
[[exemptions.actix-codec]]
version = "0.5.1"
version = "0.5.2"
criteria = "safe-to-deploy"
[[exemptions.actix-http]]
version = "3.5.1"
version = "3.6.0"
criteria = "safe-to-deploy"
[[exemptions.actix-macros]]
@ -64,7 +64,7 @@ version = "3.0.1"
criteria = "safe-to-deploy"
[[exemptions.actix-web]]
version = "4.4.1"
version = "4.5.1"
criteria = "safe-to-deploy"
[[exemptions.actix-web-codegen]]
@ -104,11 +104,11 @@ version = "0.1.1"
criteria = "safe-to-deploy"
[[exemptions.anstream]]
version = "0.6.9"
version = "0.6.11"
criteria = "safe-to-deploy"
[[exemptions.anstyle]]
version = "1.0.4"
version = "1.0.6"
criteria = "safe-to-deploy"
[[exemptions.anstyle-parse]]
@ -136,7 +136,7 @@ version = "1.6.0"
criteria = "safe-to-deploy"
[[exemptions.argon2]]
version = "0.5.2"
version = "0.5.3"
criteria = "safe-to-deploy"
[[exemptions.arrayvec]]
@ -207,10 +207,6 @@ criteria = "safe-to-deploy"
version = "0.7.4"
criteria = "safe-to-deploy"
[[exemptions.axum-client-ip]]
version = "0.5.0"
criteria = "safe-to-deploy"
[[exemptions.axum-core]]
version = "0.3.4"
criteria = "safe-to-deploy"
@ -268,7 +264,7 @@ version = "2.4.2"
criteria = "safe-to-deploy"
[[exemptions.bitmaps]]
version = "3.2.0"
version = "3.2.1"
criteria = "safe-to-deploy"
[[exemptions.bitvec]]
@ -304,15 +300,15 @@ version = "1.9.0"
criteria = "safe-to-run"
[[exemptions.bytecheck]]
version = "0.6.11"
version = "0.6.12"
criteria = "safe-to-deploy"
[[exemptions.bytecheck_derive]]
version = "0.6.11"
version = "0.6.12"
criteria = "safe-to-deploy"
[[exemptions.bytemuck]]
version = "1.14.0"
version = "1.14.2"
criteria = "safe-to-deploy"
[[exemptions.byteorder]]
@ -348,19 +344,19 @@ version = "2.4.3"
criteria = "safe-to-deploy"
[[exemptions.chrono]]
version = "0.4.31"
version = "0.4.33"
criteria = "safe-to-deploy"
[[exemptions.ciborium]]
version = "0.2.1"
version = "0.2.2"
criteria = "safe-to-deploy"
[[exemptions.ciborium-io]]
version = "0.2.1"
version = "0.2.2"
criteria = "safe-to-deploy"
[[exemptions.ciborium-ll]]
version = "0.2.1"
version = "0.2.2"
criteria = "safe-to-deploy"
[[exemptions.cipher]]
@ -456,15 +452,15 @@ version = "0.8.19"
criteria = "safe-to-deploy"
[[exemptions.darling]]
version = "0.20.3"
version = "0.20.5"
criteria = "safe-to-deploy"
[[exemptions.darling_core]]
version = "0.20.3"
version = "0.20.5"
criteria = "safe-to-deploy"
[[exemptions.darling_macro]]
version = "0.20.3"
version = "0.20.5"
criteria = "safe-to-deploy"
[[exemptions.dashmap]]
@ -575,10 +571,6 @@ criteria = "safe-to-deploy"
version = "0.11.0"
criteria = "safe-to-deploy"
[[exemptions.forwarded-header-value]]
version = "0.1.1"
criteria = "safe-to-deploy"
[[exemptions.foundationdb]]
version = "0.8.0"
criteria = "safe-to-deploy"
@ -668,7 +660,7 @@ version = "0.7.12"
criteria = "safe-to-deploy"
[[exemptions.geographiclib-rs]]
version = "0.2.3"
version = "0.2.4"
criteria = "safe-to-deploy"
[[exemptions.getrandom]]
@ -720,7 +712,7 @@ version = "0.7.17"
criteria = "safe-to-deploy"
[[exemptions.hermit-abi]]
version = "0.3.4"
version = "0.3.5"
criteria = "safe-to-deploy"
[[exemptions.home]]
@ -772,7 +764,11 @@ version = "0.5.0"
criteria = "safe-to-deploy"
[[exemptions.hyper-util]]
version = "0.1.2"
version = "0.1.3"
criteria = "safe-to-deploy"
[[exemptions.iana-time-zone]]
version = "0.1.60"
criteria = "safe-to-deploy"
[[exemptions.ignore]]
@ -784,7 +780,7 @@ version = "2.0.3"
criteria = "safe-to-deploy"
[[exemptions.imbl-sized-chunks]]
version = "0.1.1"
version = "0.1.2"
criteria = "safe-to-deploy"
[[exemptions.indexmap]]
@ -792,7 +788,7 @@ version = "1.9.3"
criteria = "safe-to-deploy"
[[exemptions.indexmap]]
version = "2.1.0"
version = "2.2.2"
criteria = "safe-to-deploy"
[[exemptions.infer]]
@ -836,7 +832,7 @@ version = "0.1.27"
criteria = "safe-to-deploy"
[[exemptions.js-sys]]
version = "0.3.67"
version = "0.3.68"
criteria = "safe-to-deploy"
[[exemptions.lalrpop]]
@ -856,7 +852,7 @@ version = "1.3.0"
criteria = "safe-to-deploy"
[[exemptions.libc]]
version = "0.2.152"
version = "0.2.153"
criteria = "safe-to-deploy"
[[exemptions.libloading]]
@ -888,7 +884,7 @@ version = "0.0.4+2.7.0"
criteria = "safe-to-deploy"
[[exemptions.libz-sys]]
version = "1.1.14"
version = "1.1.15"
criteria = "safe-to-deploy"
[[exemptions.linux-raw-sys]]
@ -907,10 +903,6 @@ criteria = "safe-to-deploy"
version = "0.4.11"
criteria = "safe-to-deploy"
[[exemptions.lru]]
version = "0.12.2"
criteria = "safe-to-deploy"
[[exemptions.lz4-sys]]
version = "1.9.4"
criteria = "safe-to-deploy"
@ -932,7 +924,7 @@ version = "2.7.1"
criteria = "safe-to-deploy"
[[exemptions.memmap2]]
version = "0.9.3"
version = "0.9.4"
criteria = "safe-to-run"
[[exemptions.miette]]
@ -959,6 +951,10 @@ criteria = "safe-to-deploy"
version = "0.2.1"
criteria = "safe-to-deploy"
[[exemptions.miniz_oxide]]
version = "0.7.2"
criteria = "safe-to-deploy"
[[exemptions.mio]]
version = "0.8.10"
criteria = "safe-to-deploy"
@ -991,22 +987,34 @@ criteria = "safe-to-deploy"
version = "7.1.3"
criteria = "safe-to-deploy"
[[exemptions.nonempty]]
version = "0.7.0"
criteria = "safe-to-deploy"
[[exemptions.num-bigint-dig]]
version = "0.8.4"
criteria = "safe-to-deploy"
[[exemptions.num-complex]]
version = "0.4.4"
version = "0.4.5"
criteria = "safe-to-deploy"
[[exemptions.num-conv]]
version = "0.1.0"
criteria = "safe-to-deploy"
[[exemptions.num-format]]
version = "0.4.4"
criteria = "safe-to-run"
[[exemptions.num-integer]]
version = "0.1.46"
criteria = "safe-to-deploy"
[[exemptions.num-iter]]
version = "0.1.44"
criteria = "safe-to-deploy"
[[exemptions.num-traits]]
version = "0.2.18"
criteria = "safe-to-deploy"
[[exemptions.num_cpus]]
version = "1.16.0"
criteria = "safe-to-deploy"
@ -1024,11 +1032,11 @@ version = "1.19.0"
criteria = "safe-to-deploy"
[[exemptions.openssl]]
version = "0.10.62"
version = "0.10.63"
criteria = "safe-to-deploy"
[[exemptions.openssl-sys]]
version = "0.9.98"
version = "0.9.99"
criteria = "safe-to-deploy"
[[exemptions.opentelemetry]]
@ -1124,11 +1132,11 @@ version = "0.5.0"
criteria = "safe-to-deploy"
[[exemptions.pin-project]]
version = "1.1.3"
version = "1.1.4"
criteria = "safe-to-deploy"
[[exemptions.pin-project-internal]]
version = "1.1.3"
version = "1.1.4"
criteria = "safe-to-deploy"
[[exemptions.pkcs1]]
@ -1139,10 +1147,6 @@ criteria = "safe-to-deploy"
version = "0.10.2"
criteria = "safe-to-deploy"
[[exemptions.pkg-config]]
version = "0.3.29"
criteria = "safe-to-deploy"
[[exemptions.plotters]]
version = "0.3.5"
criteria = "safe-to-run"
@ -1188,7 +1192,7 @@ version = "1.0.4"
criteria = "safe-to-deploy"
[[exemptions.proc-macro2]]
version = "1.0.76"
version = "1.0.78"
criteria = "safe-to-deploy"
[[exemptions.prometheus]]
@ -1220,7 +1224,7 @@ version = "0.26.0"
criteria = "safe-to-run"
[[exemptions.quick_cache]]
version = "0.4.0"
version = "0.4.1"
criteria = "safe-to-deploy"
[[exemptions.radium]]
@ -1259,14 +1263,6 @@ criteria = "safe-to-deploy"
version = "0.2.1"
criteria = "safe-to-deploy"
[[exemptions.rayon]]
version = "1.8.1"
criteria = "safe-to-run"
[[exemptions.rayon-core]]
version = "1.12.1"
criteria = "safe-to-run"
[[exemptions.rcgen]]
version = "0.11.3"
criteria = "safe-to-run"
@ -1288,7 +1284,7 @@ version = "1.0.22"
criteria = "safe-to-deploy"
[[exemptions.regex]]
version = "1.10.2"
version = "1.10.3"
criteria = "safe-to-deploy"
[[exemptions.regex-automata]]
@ -1296,7 +1292,7 @@ version = "0.1.10"
criteria = "safe-to-deploy"
[[exemptions.regex-automata]]
version = "0.4.3"
version = "0.4.5"
criteria = "safe-to-deploy"
[[exemptions.regex-syntax]]
@ -1312,11 +1308,11 @@ version = "1.9.2"
criteria = "safe-to-deploy"
[[exemptions.rend]]
version = "0.4.1"
version = "0.4.2"
criteria = "safe-to-deploy"
[[exemptions.reqwest]]
version = "0.11.23"
version = "0.11.24"
criteria = "safe-to-deploy"
[[exemptions.retain_mut]]
@ -1340,11 +1336,11 @@ version = "0.17.7"
criteria = "safe-to-deploy"
[[exemptions.rkyv]]
version = "0.7.43"
version = "0.7.44"
criteria = "safe-to-deploy"
[[exemptions.rkyv_derive]]
version = "0.7.43"
version = "0.7.44"
criteria = "safe-to-deploy"
[[exemptions.rmp]]
@ -1400,7 +1396,7 @@ version = "1.2.0"
criteria = "safe-to-deploy"
[[exemptions.rust_decimal]]
version = "1.33.1"
version = "1.34.2"
criteria = "safe-to-deploy"
[[exemptions.rustc_lexer]]
@ -1408,7 +1404,7 @@ version = "0.1.0"
criteria = "safe-to-deploy"
[[exemptions.rustix]]
version = "0.38.30"
version = "0.38.31"
criteria = "safe-to-deploy"
[[exemptions.rustls]]
@ -1488,7 +1484,7 @@ version = "1.0.193"
criteria = "safe-to-deploy"
[[exemptions.serde_html_form]]
version = "0.2.3"
version = "0.2.4"
criteria = "safe-to-deploy"
[[exemptions.serde_json]]
@ -1544,7 +1540,7 @@ version = "0.4.9"
criteria = "safe-to-deploy"
[[exemptions.smallvec]]
version = "1.12.0"
version = "1.13.1"
criteria = "safe-to-deploy"
[[exemptions.smol_str]]
@ -1664,7 +1660,7 @@ version = "0.3.6"
criteria = "safe-to-run"
[[exemptions.tempfile]]
version = "3.9.0"
version = "3.10.0"
criteria = "safe-to-deploy"
[[exemptions.term]]
@ -1688,11 +1684,11 @@ version = "0.2.14"
criteria = "safe-to-run"
[[exemptions.time]]
version = "0.3.31"
version = "0.3.34"
criteria = "safe-to-deploy"
[[exemptions.time-macros]]
version = "0.2.16"
version = "0.2.17"
criteria = "safe-to-deploy"
[[exemptions.tiny-keccak]]
@ -1704,7 +1700,7 @@ version = "1.2.1"
criteria = "safe-to-run"
[[exemptions.tokio]]
version = "1.35.1"
version = "1.36.0"
criteria = "safe-to-deploy"
[[exemptions.tokio-io-timeout]]
@ -1736,7 +1732,7 @@ version = "0.19.15"
criteria = "safe-to-deploy"
[[exemptions.toml_edit]]
version = "0.21.0"
version = "0.21.1"
criteria = "safe-to-deploy"
[[exemptions.tonic]]
@ -1804,17 +1800,13 @@ version = "1.17.0"
criteria = "safe-to-deploy"
[[exemptions.ulid]]
version = "1.1.0"
version = "1.1.2"
criteria = "safe-to-deploy"
[[exemptions.unicase]]
version = "2.7.0"
criteria = "safe-to-deploy"
[[exemptions.unicode-bidi]]
version = "0.3.15"
criteria = "safe-to-deploy"
[[exemptions.unicode-script]]
version = "0.5.5"
criteria = "safe-to-deploy"
@ -1840,7 +1832,7 @@ version = "0.7.6"
criteria = "safe-to-deploy"
[[exemptions.uuid]]
version = "1.6.1"
version = "1.7.0"
criteria = "safe-to-deploy"
[[exemptions.vswhom]]
@ -1868,31 +1860,31 @@ version = "0.11.0+wasi-snapshot-preview1"
criteria = "safe-to-deploy"
[[exemptions.wasm-bindgen]]
version = "0.2.90"
version = "0.2.91"
criteria = "safe-to-deploy"
[[exemptions.wasm-bindgen-backend]]
version = "0.2.90"
version = "0.2.91"
criteria = "safe-to-deploy"
[[exemptions.wasm-bindgen-futures]]
version = "0.4.40"
version = "0.4.41"
criteria = "safe-to-deploy"
[[exemptions.wasm-bindgen-macro]]
version = "0.2.90"
version = "0.2.91"
criteria = "safe-to-deploy"
[[exemptions.wasm-bindgen-macro-support]]
version = "0.2.90"
version = "0.2.91"
criteria = "safe-to-deploy"
[[exemptions.wasm-bindgen-shared]]
version = "0.2.90"
version = "0.2.91"
criteria = "safe-to-deploy"
[[exemptions.wasm-streams]]
version = "0.3.0"
version = "0.4.0"
criteria = "safe-to-deploy"
[[exemptions.wasmtimer]]
@ -1900,11 +1892,15 @@ version = "0.2.0"
criteria = "safe-to-deploy"
[[exemptions.web-sys]]
version = "0.3.67"
version = "0.3.68"
criteria = "safe-to-deploy"
[[exemptions.web-time]]
version = "1.0.0"
criteria = "safe-to-deploy"
[[exemptions.webpki-roots]]
version = "0.25.3"
version = "0.25.4"
criteria = "safe-to-deploy"
[[exemptions.which]]
@ -2004,7 +2000,7 @@ version = "0.52.0"
criteria = "safe-to-deploy"
[[exemptions.winnow]]
version = "0.5.34"
version = "0.5.39"
criteria = "safe-to-deploy"
[[exemptions.winreg]]

170
supply-chain/imports.lock
View file

@ -1,6 +1,14 @@
# cargo-vet imports lock
[[unpublished.surrealdb]]
version = "1.3.0"
audited_as = "1.1.1"
[[unpublished.surrealdb-core]]
version = "1.3.0"
audited_as = "1.1.5"
[[publisher.addr]]
version = "0.15.6"
when = "2022-08-31"
@ -114,8 +122,8 @@ user-login = "tobiemh"
user-name = "Tobie Morgan Hitchcock"
[[publisher.surrealdb-core]]
version = "2.0.0-alpha.1"
when = "2024-01-30"
version = "1.1.5"
when = "2024-01-31"
user-id = 145457
user-login = "tobiemh"
user-name = "Tobie Morgan Hitchcock"
@ -141,6 +149,13 @@ user-id = 145457
user-login = "tobiemh"
user-name = "Tobie Morgan Hitchcock"
[[publisher.surrealml-core]]
version = "0.0.8"
when = "2024-01-26"
user-id = 145457
user-login = "tobiemh"
user-name = "Tobie Morgan Hitchcock"
[[publisher.trice]]
version = "0.4.0"
when = "2024-01-04"
@ -156,8 +171,8 @@ user-login = "Manishearth"
user-name = "Manish Goregaokar"
[[publisher.unicode-segmentation]]
version = "1.10.1"
when = "2023-01-31"
version = "1.11.0"
when = "2024-02-07"
user-id = 1139
user-login = "Manishearth"
user-name = "Manish Goregaokar"
@ -313,15 +328,6 @@ criteria = "safe-to-deploy"
delta = "0.1.0-rc.2 -> 0.1.0"
notes = "Minor documentation updates an additions, nothing major."
[[audits.bytecode-alliance.audits.iana-time-zone]]
who = "Dan Gohman <dev@sunfishcode.online>"
criteria = "safe-to-deploy"
version = "0.1.59"
notes = """
I also manually ran windows-bindgen and confirmed that the output matches
the bindings checked into the repo.
"""
[[audits.bytecode-alliance.audits.iana-time-zone-haiku]]
who = "Dan Gohman <dev@sunfishcode.online>"
criteria = "safe-to-deploy"
@ -343,20 +349,6 @@ who = "Pat Hickey <phickey@fastly.com>"
criteria = "safe-to-deploy"
version = "0.1.0"
[[audits.bytecode-alliance.audits.miniz_oxide]]
who = "Alex Crichton <alex@alexcrichton.com>"
criteria = "safe-to-deploy"
version = "0.7.1"
notes = """
This crate is a Rust implementation of zlib compression/decompression and has
been used by default by the Rust standard library for quite some time. It's also
a default dependency of the popular `backtrace` crate for decompressing debug
information. This crate forbids unsafe code and does not otherwise access system
resources. It's originally a port of the `miniz.c` library as well, and given
its own longevity should be relatively hardened against some of the more common
compression-related issues.
"""
[[audits.bytecode-alliance.audits.native-tls]]
who = "Pat Hickey <phickey@fastly.com>"
criteria = "safe-to-deploy"
@ -407,6 +399,21 @@ who = "Pat Hickey <phickey@fastly.com>"
criteria = "safe-to-deploy"
version = "0.1.0"
[[audits.bytecode-alliance.audits.pkg-config]]
who = "Pat Hickey <phickey@fastly.com>"
criteria = "safe-to-deploy"
version = "0.3.25"
notes = "This crate shells out to the pkg-config executable, but it appears to sanitize inputs reasonably."
[[audits.bytecode-alliance.audits.pkg-config]]
who = "Alex Crichton <alex@alexcrichton.com>"
criteria = "safe-to-deploy"
delta = "0.3.26 -> 0.3.29"
notes = """
No `unsafe` additions or anything outside of the purview of the crate in this
change.
"""
[[audits.bytecode-alliance.audits.quote]]
who = "Pat Hickey <phickey@fastly.com>"
criteria = "safe-to-deploy"
@ -478,6 +485,15 @@ criteria = "safe-to-deploy"
version = "0.2.4"
notes = "Implements a concurrency primitive with atomics, and is not obviously incorrect"
[[audits.bytecode-alliance.audits.unicode-bidi]]
who = "Alex Crichton <alex@alexcrichton.com>"
criteria = "safe-to-deploy"
version = "0.3.8"
notes = """
This crate has no unsafe code and does not use `std::*`. Skimming the crate it
does not attempt to out of the bounds of what it's already supposed to be doing.
"""
[[audits.bytecode-alliance.audits.unicode-ident]]
who = "Pat Hickey <phickey@fastly.com>"
criteria = "safe-to-deploy"
@ -763,16 +779,6 @@ who = "David Cook <dcook@divviup.org>"
criteria = "safe-to-deploy"
delta = "0.4.3 -> 0.4.4"
[[audits.isrg.audits.num-traits]]
who = "David Cook <dcook@divviup.org>"
criteria = "safe-to-deploy"
delta = "0.2.15 -> 0.2.16"
[[audits.isrg.audits.num-traits]]
who = "Ameer Ghani <inahga@divviup.org>"
criteria = "safe-to-deploy"
delta = "0.2.16 -> 0.2.17"
[[audits.isrg.audits.rand_chacha]]
who = "David Cook <dcook@divviup.org>"
criteria = "safe-to-deploy"
@ -783,6 +789,26 @@ who = "David Cook <dcook@divviup.org>"
criteria = "safe-to-deploy"
version = "0.6.3"
[[audits.isrg.audits.rayon]]
who = "Brandon Pitman <bran@bran.land>"
criteria = "safe-to-deploy"
delta = "1.6.1 -> 1.7.0"
[[audits.isrg.audits.rayon]]
who = "David Cook <dcook@divviup.org>"
criteria = "safe-to-deploy"
delta = "1.7.0 -> 1.8.0"
[[audits.isrg.audits.rayon]]
who = "Ameer Ghani <inahga@divviup.org>"
criteria = "safe-to-deploy"
delta = "1.8.0 -> 1.8.1"
[[audits.isrg.audits.rayon-core]]
who = "Ameer Ghani <inahga@divviup.org>"
criteria = "safe-to-deploy"
version = "1.12.1"
[[audits.isrg.audits.thiserror]]
who = "Brandon Pitman <bran@bran.land>"
criteria = "safe-to-deploy"
@ -1057,17 +1083,6 @@ criteria = "safe-to-deploy"
delta = "0.3.27 -> 0.3.28"
aggregated-from = "https://hg.mozilla.org/mozilla-central/raw-file/tip/supply-chain/audits.toml"
[[audits.mozilla.audits.half]]
who = "John M. Schanck <jschanck@mozilla.com>"
criteria = "safe-to-deploy"
version = "1.8.2"
notes = """
This crate contains unsafe code for bitwise casts to/from binary16 floating-point
format. I've reviewed these and found no issues. There are no uses of ambient
capabilities.
"""
aggregated-from = "https://hg.mozilla.org/mozilla-central/raw-file/tip/supply-chain/audits.toml"
[[audits.mozilla.audits.hashbrown]]
who = "Mike Hommey <mh+mozilla@glandium.org>"
criteria = "safe-to-deploy"
@ -1141,27 +1156,6 @@ version = "0.4.3"
notes = "All code written or reviewed by Josh Stone."
aggregated-from = "https://hg.mozilla.org/mozilla-central/raw-file/tip/supply-chain/audits.toml"
[[audits.mozilla.audits.num-integer]]
who = "Josh Stone <jistone@redhat.com>"
criteria = "safe-to-deploy"
version = "0.1.45"
notes = "All code written or reviewed by Josh Stone."
aggregated-from = "https://hg.mozilla.org/mozilla-central/raw-file/tip/supply-chain/audits.toml"
[[audits.mozilla.audits.num-iter]]
who = "Josh Stone <jistone@redhat.com>"
criteria = "safe-to-deploy"
version = "0.1.43"
notes = "All code written or reviewed by Josh Stone."
aggregated-from = "https://hg.mozilla.org/mozilla-central/raw-file/tip/supply-chain/audits.toml"
[[audits.mozilla.audits.num-traits]]
who = "Josh Stone <jistone@redhat.com>"
criteria = "safe-to-deploy"
version = "0.2.15"
notes = "All code written or reviewed by Josh Stone."
aggregated-from = "https://hg.mozilla.org/mozilla-central/raw-file/tip/supply-chain/audits.toml"
[[audits.mozilla.audits.peeking_take_while]]
who = "Bobby Holley <bobbyholley@gmail.com>"
criteria = "safe-to-deploy"
@ -1187,6 +1181,12 @@ criteria = "safe-to-deploy"
delta = "0.10.0 -> 0.11.2"
aggregated-from = "https://hg.mozilla.org/mozilla-central/raw-file/tip/supply-chain/audits.toml"
[[audits.mozilla.audits.pkg-config]]
who = "Mike Hommey <mh+mozilla@glandium.org>"
criteria = "safe-to-deploy"
delta = "0.3.25 -> 0.3.26"
aggregated-from = "https://hg.mozilla.org/mozilla-central/raw-file/tip/supply-chain/audits.toml"
[[audits.mozilla.audits.precomputed-hash]]
who = "Bobby Holley <bobbyholley@gmail.com>"
criteria = "safe-to-deploy"
@ -1242,6 +1242,19 @@ criteria = "safe-to-deploy"
delta = "0.6.3 -> 0.6.4"
aggregated-from = "https://hg.mozilla.org/mozilla-central/raw-file/tip/supply-chain/audits.toml"
[[audits.mozilla.audits.rayon]]
who = "Josh Stone <jistone@redhat.com>"
criteria = "safe-to-deploy"
version = "1.5.3"
notes = "All code written or reviewed by Josh Stone or Niko Matsakis."
aggregated-from = "https://hg.mozilla.org/mozilla-central/raw-file/tip/supply-chain/audits.toml"
[[audits.mozilla.audits.rayon]]
who = "Mike Hommey <mh+mozilla@glandium.org>"
criteria = "safe-to-deploy"
delta = "1.5.3 -> 1.6.1"
aggregated-from = "https://hg.mozilla.org/mozilla-central/raw-file/tip/supply-chain/audits.toml"
[[audits.mozilla.audits.rustc-hash]]
who = "Bobby Holley <bobbyholley@gmail.com>"
criteria = "safe-to-deploy"
@ -1287,6 +1300,25 @@ criteria = "safe-to-deploy"
delta = "0.1.0 -> 0.1.1"
aggregated-from = "https://hg.mozilla.org/mozilla-central/raw-file/tip/supply-chain/audits.toml"
[[audits.mozilla.audits.unicode-bidi]]
who = "Makoto Kato <m_kato@ga2.so-net.ne.jp>"
criteria = "safe-to-deploy"
delta = "0.3.8 -> 0.3.13"
aggregated-from = "https://hg.mozilla.org/mozilla-central/raw-file/tip/supply-chain/audits.toml"
[[audits.mozilla.audits.unicode-bidi]]
who = "Jonathan Kew <jkew@mozilla.com>"
criteria = "safe-to-deploy"
delta = "0.3.13 -> 0.3.14"
notes = "I am the author of the bulk of the upstream changes in this version, and also checked the remaining post-0.3.13 changes."
aggregated-from = "https://hg.mozilla.org/mozilla-central/raw-file/tip/supply-chain/audits.toml"
[[audits.mozilla.audits.unicode-bidi]]
who = "Jonathan Kew <jfkthame@gmail.com>"
criteria = "safe-to-deploy"
delta = "0.3.14 -> 0.3.15"
aggregated-from = "https://hg.mozilla.org/mozilla-central/raw-file/tip/supply-chain/audits.toml"
[[audits.mozilla.audits.unicode-ident]]
who = "Jan-Erik Rediger <jrediger@mozilla.com>"
criteria = "safe-to-deploy"

2
tests/ml_integration.rs
View file

@ -1,7 +1,7 @@
// RUST_LOG=warn cargo make ci-ml-integration
mod common;
#[cfg(feature = "ml")]
#[cfg(any(feature = "ml", feature = "ml2"))]
mod ml_integration {
use super::*;