diff --git a/Cargo.lock b/Cargo.lock index bd8279f5..5245a514 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -154,17 +154,17 @@ checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" [[package]] name = "bindgen" -version = "0.69.2" +version = "0.69.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4c69fae65a523209d34240b60abe0c42d33d1045d445c0839d8a4894a736e2d" +checksum = "a00dc851838a2120612785d195287475a3ac45514741da670b735818822129a0" dependencies = [ "bitflags 2.4.2", "cexpr", "clang-sys", + "itertools 0.12.1", "lazy_static", "lazycell", "log", - "peeking_take_while", "prettyplease", "proc-macro2", "quote", @@ -252,9 +252,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[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", @@ -263,15 +263,15 @@ 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", @@ -422,7 +422,7 @@ dependencies = [ "clap", "criterion-plot", "is-terminal", - "itertools", + "itertools 0.10.5", "num-traits", "once_cell", "oorandom", @@ -443,7 +443,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6b50826342786a51a89e2da3a28f1c32b06e387201bc2d19791f622c673706b1" dependencies = [ "cast", - "itertools", + "itertools 0.10.5", ] [[package]] @@ -471,6 +471,12 @@ version = "0.8.19" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "248e3bacc7dc6baa3b21e405ee045c3047101a49145e7e9eca583ab4c2ca5345" +[[package]] +name = "crunchy" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" + [[package]] name = "crypto-common" version = "0.1.6" @@ -670,9 +676,13 @@ dependencies = [ [[package]] name = "half" -version = "1.8.2" +version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eabb4a44450da02c90444cf74558da904edde8fb4e9035a9a6a4e15445af0bd7" +checksum = "bc52e53916c08643f1b56ec082790d1e86a32e58dc5268f897f313fbae7b4872" +dependencies = [ + "cfg-if", + "crunchy", +] [[package]] name = "heck" @@ -682,9 +692,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" @@ -759,6 +769,15 @@ dependencies = [ "either", ] +[[package]] +name = "itertools" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569" +dependencies = [ + "either", +] + [[package]] name = "itoa" version = "1.0.10" @@ -926,11 +945,17 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "61807f77802ff30975e01f4f071c8ba10c022052f98b3294119f3e615d13e5be" +[[package]] +name = "num-conv" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" + [[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", ] @@ -1184,12 +1209,6 @@ dependencies = [ "windows-targets 0.48.5", ] -[[package]] -name = "peeking_take_while" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099" - [[package]] name = "peg" version = "0.8.2" @@ -1578,15 +1597,15 @@ dependencies = [ [[package]] name = "rustls-pki-types" -version = "1.1.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e9d979b3ce68192e42760c7810125eb6cf2ea10efae545a156063e61f314e2a" +checksum = "0a716eb65e3158e90e17cd93d855216e27bde02745ab842f2cab4a39dba1bacf" [[package]] name = "rustls-webpki" -version = "0.102.1" +version = "0.102.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef4ca26037c909dedb327b48c3327d0ba91d3dd3c4e05dad328f210ffb68e95b" +checksum = "faaa0a62740bedb9b2ef5afa303da42764c012f743917351dc9a237ea1663610" dependencies = [ "ring", "rustls-pki-types", @@ -1668,9 +1687,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.111" +version = "1.0.113" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "176e46fa42316f18edd598015a5166857fc835ec732f5215eac6b7bdbf0a84f4" +checksum = "69801b70b1c3dac963ecb03a364ba0ceda9cf60c71cfe475e99864759c8b8a79" dependencies = [ "itoa", "ryu", @@ -1830,12 +1849,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", @@ -1850,10 +1870,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", ] @@ -2060,9 +2081,9 @@ checksum = "4f186bd2dcf04330886ce82d6f33dd75a7bfcf69ecf5763b89fcde53b6ac9838" [[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", @@ -2070,9 +2091,9 @@ dependencies = [ [[package]] name = "webpki-roots" -version = "0.26.0" +version = "0.26.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0de2cfda980f21be5a7ed2eadb3e6fe074d56022bea2cdeb1a62eb220fc04188" +checksum = "b3de34ae270483955a94f4b21bdaaeb83d508bb84a01435f393818edb0012009" dependencies = [ "rustls-pki-types", ] diff --git a/Cargo.toml b/Cargo.toml index 6dc9e73a..7cbc711b 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -46,16 +46,8 @@ libc = "0.2.147" md-5 = "0.10" memchr = "2.5" oxhttp = "0.2.0-alpha.3" -oxigraph = { version = "0.4.0-alpha.3-dev", path = "./lib/oxigraph" } oxilangtag = "0.1" oxiri = "0.2.3-alpha.1" -oxrdf = { version = "0.2.0-alpha.2", path = "lib/oxrdf" } -oxrdfdatatypes = { version = "0.2.0-alpha.1", path = "lib/oxsdatatypes" } -oxrdfio = { version = "0.1.0-alpha.2", path = "lib/oxrdfio" } -oxrdfxml = { version = "0.1.0-alpha.2", path = "lib/oxrdfxml" } -oxrocksdb-sys = { version = "0.4.0-alpha.3-dev", path = "./oxrocksdb-sys" } -oxsdatatypes = { version = "0.2.0-alpha.1", path = "lib/oxsdatatypes" } -oxttl = { version = "0.1.0-alpha.2", path = "lib/oxttl" } peg = "0.8" pkg-config = "0.3.25" predicates = ">=2.0, <4.0" @@ -67,9 +59,6 @@ regex = "1.7" sha1 = "0.10" sha2 = "0.10" siphasher = ">=0.3, <2.0" -sparesults = { version = "0.2.0-alpha.2", path = "lib/sparesults" } -spargebra = { version = "0.3.0-alpha.2", path = "lib/spargebra" } -sparopt = { version = "0.1.0-alpha.2", path = "lib/sparopt"} text-diff = "0.4" time = "0.3" tokio = "1.29" @@ -77,60 +66,18 @@ url = "2.4" wasm-bindgen = "0.2.83" zstd = ">=0.12, <0.14" -[workspace.dependencies] -anyhow = "1.0.72" -arbitrary = { version = "1.3", features = ["derive"] } -assert_cmd = "2.0" -assert_fs = "1.0" -bindgen = ">=0.60, <0.70" -cc = { version = "1.0.73", features = ["parallel"] } -clap = { version = "4.0", features = ["derive"] } -codspeed-criterion-compat = "2.3.3" -console_error_panic_hook = "0.1.7" -digest = "0.10" -escargot = "0.5" -flate2 = "1.0" -getrandom = "0.2.8" -hex = "0.4" -js-sys = "0.3.60" -json-event-parser = "0.2.0-alpha.2" -libc = "0.2.147" -libfuzzer-sys = "0.4" -md-5 = "0.10" -memchr = "2.5" -oxhttp = "0.2.0-alpha.3" -oxilangtag = "0.1" -oxiri = "0.2.3-alpha.1" -peg = "0.8" -pkg-config = "0.3.25" -predicates = ">=2.0, <4.0" -pyo3 = { version = "0.20.1", features = ["extension-module"] } -quick-xml = ">=0.29, <0.32" -rand = "0.8" -rayon-core = "1.11" -regex = "1.7" -sha1 = "0.10" -sha2 = "0.10" -siphasher = ">=0.3, <2.0" -text-diff = "0.4" -time = { version = "0.3", features = ["formatting"] } -tokio = "1.29" -url = "2.4" -wasm-bindgen = "0.2.83" -zstd = ">=0.12, <0.14" - # Internal dependencies -oxigraph = { path = "lib", version = "0.4.0-alpha.3" } -oxrdf = { path = "lib/oxrdf", version = "0.2.0-alpha.2" } -oxrdfio = { path = "lib/oxrdfio", version = "0.1.0-alpha.2" } -oxrdfxml = { path = "lib/oxrdfxml", version = "0.1.0-alpha.2" } -oxrocksdb-sys = { path = "oxrocksdb-sys", version = "0.4.0-alpha.3" } -oxsdatatypes = { path = "lib/oxsdatatypes", version = "0.2.0-alpha.1" } -oxttl = { path = "lib/oxttl", version = "0.1.0-alpha.2" } -sparesults = { path = "lib/sparesults", version = "0.2.0-alpha.2" } -spargebra = { path = "lib/spargebra", version = "0.3.0-alpha.2" } -sparopt = { path = "lib/sparopt", version = "0.1.0-alpha.2" } -sparql-smith = { path = "lib/sparql-smith" } +oxigraph = { version = "0.4.0-alpha.3-dev", path = "lib/oxigraph" } +oxrdf = { version = "0.2.0-alpha.2", path = "lib/oxrdf" } +oxrdfio = { version = "0.1.0-alpha.2", path = "lib/oxrdfio" } +oxrdfxml = { version = "0.1.0-alpha.2", path = "lib/oxrdfxml" } +oxrocksdb-sys = { version = "0.4.0-alpha.3-dev", path = "./oxrocksdb-sys" } +oxsdatatypes = { version = "0.2.0-alpha.1", path = "lib/oxsdatatypes" } +oxttl = { version = "0.1.0-alpha.2", path = "lib/oxttl" } +sparesults = { version = "0.2.0-alpha.2", path = "lib/sparesults" } +spargebra = { version = "0.3.0-alpha.2", path = "lib/spargebra" } +sparopt = { version = "0.1.0-alpha.2", path = "lib/sparopt" } +sparql-smith = { version = "0.1.0-alpha.5", path = "lib/sparql-smith" } [workspace.lints.rust] absolute_paths_not_starting_with_crate = "warn" diff --git a/fuzz/Cargo.toml b/fuzz/Cargo.toml index ae8ee0cc..8ce8daf3 100644 --- a/fuzz/Cargo.toml +++ b/fuzz/Cargo.toml @@ -8,15 +8,15 @@ edition = "2021" cargo-fuzz = true [dependencies] -anyhow.workspace = true -libfuzzer-sys.workspace = true -oxigraph.workspace = true -oxrdf = { workspace = true, features = ["rdf-star"] } -oxrdfxml.workspace = true -oxttl = { workspace = true, features = ["rdf-star"] } -sparesults = { workspace = true, features = ["rdf-star"] } -spargebra = { workspace = true, features = ["rdf-star", "sep-0006"] } -sparql-smith = { workspace = true, features = ["sep-0006"] } +anyhow = "1.0.72" +libfuzzer-sys = "0.4" +oxigraph = { path = "../lib/oxigraph" } +oxrdf = { path = "../lib/oxrdf", features = ["rdf-star"] } +oxrdfxml = { path = "../lib/oxrdfxml" } +oxttl = { path = "../lib/oxttl", features = ["rdf-star"] } +sparesults = { path = "../lib/sparesults", features = ["rdf-star"] } +spargebra = { path = "../lib/spargebra", features = ["rdf-star", "sep-0006"] } +sparql-smith = { path = "../lib/sparql-smith", features = ["sep-0006"] } [profile.release] codegen-units = 1