build: update croaring crate to fix bindgen errors for recent C compilers (#3770)

This commit is contained in:
ard'O'crat 2023-09-28 13:58:11 +03:00 committed by GitHub
parent 94277bba9d
commit 059ae0390d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 26 additions and 52 deletions

72
Cargo.lock generated
View file

@ -162,25 +162,21 @@ checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b"
[[package]] [[package]]
name = "bindgen" name = "bindgen"
version = "0.56.0" version = "0.59.2"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2da379dbebc0b76ef63ca68d8fc6e71c0f13e59432e0987e508c1820e6ab5239" checksum = "2bd2a9a458e8f4304c52c43ebb0cfbd520289f8379a52e329a38afda99bf8eb8"
dependencies = [ dependencies = [
"bitflags 1.3.2", "bitflags 1.3.2",
"cexpr", "cexpr",
"clang-sys", "clang-sys",
"clap",
"env_logger 0.8.4",
"lazy_static", "lazy_static",
"lazycell", "lazycell",
"log",
"peeking_take_while", "peeking_take_while",
"proc-macro2 1.0.66", "proc-macro2 1.0.66",
"quote 1.0.32", "quote 1.0.32",
"regex", "regex",
"rustc-hash", "rustc-hash",
"shlex", "shlex",
"which",
] ]
[[package]] [[package]]
@ -284,9 +280,9 @@ dependencies = [
[[package]] [[package]]
name = "cexpr" name = "cexpr"
version = "0.4.0" version = "0.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f4aedb84272dbe89af497cf81375129abda4fc0a9e7c5d317498c15cc30c0d27" checksum = "6fac387a98bb7c37292057cffc56d62ecb629900026402633ae9160df93a8766"
dependencies = [ dependencies = [
"nom", "nom",
] ]
@ -403,9 +399,9 @@ dependencies = [
[[package]] [[package]]
name = "croaring" name = "croaring"
version = "0.4.6" version = "0.5.2"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a00d14ad7d8cc067d7a5c93e8563791bfec3f7182361db955530db11d94ed63c" checksum = "aff1eea8a79ffa2a743c1322d5c3853d45699b7842197160c7c32a18c32c1866"
dependencies = [ dependencies = [
"byteorder", "byteorder",
"croaring-sys", "croaring-sys",
@ -414,9 +410,9 @@ dependencies = [
[[package]] [[package]]
name = "croaring-sys" name = "croaring-sys"
version = "0.4.6" version = "0.5.2"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c5d6a46501bb403a61e43bc7cd19977b4f9c54efd703949b00259cc61afb5a86" checksum = "21d77e33a1d5e04573f79846692e72f2e02e0fdd942b90f023c45f146d3447db"
dependencies = [ dependencies = [
"bindgen", "bindgen",
"cc", "cc",
@ -667,20 +663,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "44533bbbb3bb3c1fa17d9f2e4e38bbbaf8396ba82193c4cb1b6445d711445d36" checksum = "44533bbbb3bb3c1fa17d9f2e4e38bbbaf8396ba82193c4cb1b6445d711445d36"
dependencies = [ dependencies = [
"atty", "atty",
"humantime 1.3.0", "humantime",
"log",
"regex",
"termcolor",
]
[[package]]
name = "env_logger"
version = "0.8.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a19187fea3ac7e84da7dacf48de0c45d63c6a76f9490dae389aead16c243fce3"
dependencies = [
"atty",
"humantime 2.1.0",
"log", "log",
"regex", "regex",
"termcolor", "termcolor",
@ -998,7 +981,7 @@ dependencies = [
"chrono", "chrono",
"croaring", "croaring",
"enum_primitive", "enum_primitive",
"env_logger 0.7.1", "env_logger",
"grin_core", "grin_core",
"grin_keychain", "grin_keychain",
"grin_store", "grin_store",
@ -1166,7 +1149,7 @@ dependencies = [
"byteorder", "byteorder",
"chrono", "chrono",
"croaring", "croaring",
"env_logger 0.7.1", "env_logger",
"filetime", "filetime",
"grin_core", "grin_core",
"grin_util", "grin_util",
@ -1309,12 +1292,6 @@ dependencies = [
"quick-error", "quick-error",
] ]
[[package]]
name = "humantime"
version = "2.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4"
[[package]] [[package]]
name = "hyper" name = "hyper"
version = "0.13.10" version = "0.13.10"
@ -1600,7 +1577,7 @@ dependencies = [
"chrono", "chrono",
"flate2", "flate2",
"fnv", "fnv",
"humantime 1.3.0", "humantime",
"libc", "libc",
"log", "log",
"log-mdc", "log-mdc",
@ -1646,6 +1623,12 @@ dependencies = [
"winapi 0.3.9", "winapi 0.3.9",
] ]
[[package]]
name = "minimal-lexical"
version = "0.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
[[package]] [[package]]
name = "miniz_oxide" name = "miniz_oxide"
version = "0.7.1" version = "0.7.1"
@ -1760,12 +1743,12 @@ checksum = "72ef4a56884ca558e5ddb05a1d1e7e1bfd9a68d9ed024c21704cc98872dae1bb"
[[package]] [[package]]
name = "nom" name = "nom"
version = "5.1.3" version = "7.1.3"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "08959a387a676302eebf4ddbcbc611da04285579f76f88ee0506c63b1a61dd4b" checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a"
dependencies = [ dependencies = [
"memchr", "memchr",
"version_check", "minimal-lexical",
] ]
[[package]] [[package]]
@ -2565,9 +2548,9 @@ dependencies = [
[[package]] [[package]]
name = "shlex" name = "shlex"
version = "0.1.1" version = "1.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7fdf1b9db47230893d76faad238fd6097fd6d6a9245cd7a4d90dbd639536bbd2" checksum = "a7cee0529a6d40f580e7a5e6c495c8fbfe21b7b52795ed4bb5e62cdf92bc6380"
[[package]] [[package]]
name = "signal-hook" name = "signal-hook"
@ -3171,15 +3154,6 @@ dependencies = [
"untrusted", "untrusted",
] ]
[[package]]
name = "which"
version = "3.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d011071ae14a2f6671d0b74080ae0cd8ebf3a6f8c9589a2cd45f23126fe29724"
dependencies = [
"libc",
]
[[package]] [[package]]
name = "winapi" name = "winapi"
version = "0.2.8" version = "0.2.8"

View file

@ -13,7 +13,7 @@ edition = "2018"
bit-vec = "0.6" bit-vec = "0.6"
bitflags = "1" bitflags = "1"
byteorder = "1" byteorder = "1"
croaring = "0.4.6" croaring = "0.5.2"
enum_primitive = "0.1" enum_primitive = "0.1"
log = "0.4" log = "0.4"
serde = "1" serde = "1"

View file

@ -12,7 +12,7 @@ edition = "2018"
[dependencies] [dependencies]
blake2 = { package = "blake2-rfc", version = "0.2"} blake2 = { package = "blake2-rfc", version = "0.2"}
byteorder = "1" byteorder = "1"
croaring = "0.4.6" croaring = "0.5.2"
enum_primitive = "0.1" enum_primitive = "0.1"
lazy_static = "1" lazy_static = "1"
lru-cache = "0.1" lru-cache = "0.1"

View file

@ -11,7 +11,7 @@ edition = "2018"
[dependencies] [dependencies]
byteorder = "1" byteorder = "1"
croaring = "0.4.6" croaring = "0.5.2"
libc = "0.2" libc = "0.2"
lmdb-zero = "0.4.4" lmdb-zero = "0.4.4"
memmap = "0.7" memmap = "0.7"