diff --git a/Cargo.lock b/Cargo.lock index 3f8013eea2..a30dce2222 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -174,7 +174,7 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "db02d390bf6643fb404d3d22d31aee1c4bc4459600aef9113833d17e786c6e44" dependencies = [ - "quote 1.0.18", + "quote 1.0.36", "syn 1.0.98", ] @@ -186,7 +186,7 @@ checksum = "db2fd794a08ccb318058009eefdf15bcaaaaf6f8161eb3345f907222bac38b20" dependencies = [ "num-bigint 0.4.3", "num-traits", - "quote 1.0.18", + "quote 1.0.36", "syn 1.0.98", ] @@ -256,8 +256,8 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "726535892e8eae7e70657b4c8ea93d26b8553afb1ce617caee529ef96d7dee6c" dependencies = [ - "proc-macro2 1.0.41", - "quote 1.0.18", + "proc-macro2 1.0.85", + "quote 1.0.36", "syn 1.0.98", "synstructure", ] @@ -268,8 +268,8 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2777730b2039ac0f95f093556e61b6d26cebed5393ca6f152717777cec3a42ed" dependencies = [ - "proc-macro2 1.0.41", - "quote 1.0.18", + "proc-macro2 1.0.85", + "quote 1.0.36", "syn 1.0.98", ] @@ -332,8 +332,8 @@ version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "648ed8c8d2ce5409ccd57453d9d1b214b342a0d69376a6feda1fd6cae3299308" dependencies = [ - "proc-macro2 1.0.41", - "quote 1.0.18", + "proc-macro2 1.0.85", + "quote 1.0.36", "syn 1.0.98", ] @@ -343,8 +343,8 @@ version = "0.1.57" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "76464446b8bc32758d7e88ee1a804d9914cd9b1cb264c029899680b0be29826f" dependencies = [ - "proc-macro2 1.0.41", - "quote 1.0.18", + "proc-macro2 1.0.85", + "quote 1.0.36", "syn 1.0.98", ] @@ -382,7 +382,7 @@ checksum = "47594e438a243791dba58124b6669561f5baa14cb12046641d8008bf035e5a25" dependencies = [ "async-trait", "axum-core", - "bitflags", + "bitflags 1.3.2", "bytes", "futures-util", "http", @@ -462,21 +462,22 @@ dependencies = [ [[package]] name = "bindgen" -version = "0.60.1" +version = "0.69.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "062dddbc1ba4aca46de6338e2bf87771414c335f7b2f2036e8f3e9befebf88e6" +checksum = "a00dc851838a2120612785d195287475a3ac45514741da670b735818822129a0" dependencies = [ - "bitflags", + "bitflags 2.5.0", "cexpr", "clang-sys", + "itertools", "lazy_static", "lazycell", - "peeking_take_while", - "proc-macro2 1.0.41", - "quote 1.0.18", + "proc-macro2 1.0.85", + "quote 1.0.36", "regex", "rustc-hash", "shlex", + "syn 2.0.66", ] [[package]] @@ -500,6 +501,12 @@ version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" +[[package]] +name = "bitflags" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1" + [[package]] name = "bitmaps" version = "2.1.0" @@ -588,7 +595,7 @@ dependencies = [ "borsh-derive-internal", "borsh-schema-derive-internal", "proc-macro-crate 0.1.5", - "proc-macro2 1.0.41", + "proc-macro2 1.0.85", "syn 1.0.98", ] @@ -598,8 +605,8 @@ version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5449c28a7b352f2d1e592a8a28bf139bc71afb0764a14f3c02500935d8c44065" dependencies = [ - "proc-macro2 1.0.41", - "quote 1.0.18", + "proc-macro2 1.0.85", + "quote 1.0.36", "syn 1.0.98", ] @@ -609,8 +616,8 @@ version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cdbd5696d8bfa21d53d9fe39a714a18538bad11492a42d066dbbc395fb1951c0" dependencies = [ - "proc-macro2 1.0.41", - "quote 1.0.18", + "proc-macro2 1.0.85", + "quote 1.0.36", "syn 1.0.98", ] @@ -705,8 +712,8 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "562e382481975bc61d11275ac5e62a19abd00b0547d99516a415336f183dcd0e" dependencies = [ - "proc-macro2 1.0.41", - "quote 1.0.18", + "proc-macro2 1.0.85", + "quote 1.0.36", "syn 1.0.98", ] @@ -892,7 +899,7 @@ checksum = "37e58ac78573c40708d45522f0d80fa2f01cc4f9b4e2bf749807255454312002" dependencies = [ "ansi_term", "atty", - "bitflags", + "bitflags 1.3.2", "strsim 0.8.0", "textwrap 0.11.0", "unicode-width", @@ -906,7 +913,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "71c47df61d9e16dc010b55dba1952a57d8c215dbb533fd13cdd13369aac73b1c" dependencies = [ "atty", - "bitflags", + "bitflags 1.3.2", "clap_derive", "indexmap", "lazy_static", @@ -924,8 +931,8 @@ checksum = "a3aab4734e083b809aaf5794e14e756d1c798d2c69c7f7de7a09a2f5214993c1" dependencies = [ "heck 0.4.0", "proc-macro-error", - "proc-macro2 1.0.41", - "quote 1.0.18", + "proc-macro2 1.0.85", + "quote 1.0.36", "syn 1.0.98", ] @@ -998,8 +1005,8 @@ version = "0.2.22" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ef196d5d972878a48da7decb7686eded338b4858fbabeed513d63a7c98b2b82d" dependencies = [ - "proc-macro2 1.0.41", - "quote 1.0.18", + "proc-macro2 1.0.85", + "quote 1.0.36", "unicode-xid 0.2.2", ] @@ -1261,8 +1268,8 @@ version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b" dependencies = [ - "proc-macro2 1.0.41", - "quote 1.0.18", + "proc-macro2 1.0.85", + "quote 1.0.36", "syn 1.0.98", ] @@ -1273,8 +1280,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "40eebddd2156ce1bb37b20bbe5151340a31828b1f2d22ba4141f3531710e38df" dependencies = [ "convert_case", - "proc-macro2 1.0.41", - "quote 1.0.18", + "proc-macro2 1.0.85", + "quote 1.0.36", "rustc_version 0.3.3", "syn 1.0.98", ] @@ -1361,8 +1368,8 @@ version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3bf95dc3f046b9da4f2d51833c0d3547d8564ef6910f5c1ed130306a75b92886" dependencies = [ - "proc-macro2 1.0.41", - "quote 1.0.18", + "proc-macro2 1.0.85", + "quote 1.0.36", "syn 1.0.98", ] @@ -1443,8 +1450,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f86b50932a01e7ec5c06160492ab660fb19b6bb2a7878030dd6cd68d21df9d4d" dependencies = [ "enum-ordinalize", - "proc-macro2 1.0.41", - "quote 1.0.18", + "proc-macro2 1.0.85", + "quote 1.0.36", "syn 1.0.98", ] @@ -1484,8 +1491,8 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "828de45d0ca18782232dfb8f3ea9cc428e8ced380eb26a520baaacfc70de39ce" dependencies = [ - "proc-macro2 1.0.41", - "quote 1.0.18", + "proc-macro2 1.0.85", + "quote 1.0.36", "syn 1.0.98", ] @@ -1497,8 +1504,8 @@ checksum = "0b166c9e378360dd5a6666a9604bb4f54ae0cac39023ffbac425e917a2a04fef" dependencies = [ "num-bigint 0.4.3", "num-traits", - "proc-macro2 1.0.41", - "quote 1.0.18", + "proc-macro2 1.0.85", + "quote 1.0.36", "syn 1.0.98", ] @@ -1509,8 +1516,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0eb359f1476bf611266ac1f5355bc14aeca37b299d0ebccc038ee7058891c9cb" dependencies = [ "once_cell", - "proc-macro2 1.0.41", - "quote 1.0.18", + "proc-macro2 1.0.85", + "quote 1.0.36", "syn 1.0.98", ] @@ -1762,8 +1769,8 @@ version = "0.3.25" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bdfb8ce053d86b91919aad980c220b1fb8401a9394410e1c289ed7e66b61835d" dependencies = [ - "proc-macro2 1.0.41", - "quote 1.0.18", + "proc-macro2 1.0.85", + "quote 1.0.36", "syn 1.0.98", ] @@ -1823,7 +1830,7 @@ version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "32c95766e0414f8bfc1d07055574c621b67739466d6ba516c4fef8e99d30d2e6" dependencies = [ - "bitflags", + "bitflags 1.3.2", "cfg-if 1.0.0", "log", "managed", @@ -2004,7 +2011,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4cff78e5788be1e0ab65b04d306b2ed5092c815ec97ec70f4ebd5aee158aa55d" dependencies = [ "base64 0.13.0", - "bitflags", + "bitflags 1.3.2", "bytes", "headers-core", "http", @@ -2441,8 +2448,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5b939a78fa820cdfcb7ee7484466746a7377760970f6f9c6fe19f9edcc8a38d2" dependencies = [ "proc-macro-crate 0.1.5", - "proc-macro2 1.0.41", - "quote 1.0.18", + "proc-macro2 1.0.85", + "quote 1.0.36", "syn 1.0.98", ] @@ -2562,9 +2569,9 @@ checksum = "c7d73b3f436185384286bd8098d17ec07c9a7d2388a6599f824d8502b529702a" [[package]] name = "librocksdb-sys" -version = "0.8.0+7.4.4" +version = "0.16.0+8.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "611804e4666a25136fcc5f8cf425ab4d26c7f74ea245ffe92ea23b85b6420b5d" +checksum = "ce3d60bc059831dc1c83903fb45c103f75db65c5a7bf22272764d9cc683e348c" dependencies = [ "bindgen", "bzip2-sys", @@ -2572,6 +2579,7 @@ dependencies = [ "glob", "libc", "libz-sys", + "lz4-sys", ] [[package]] @@ -2817,8 +2825,8 @@ version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5a7d5f7076603ebc68de2dc6a650ec331a062a13abaa346975be747bbfa4b789" dependencies = [ - "proc-macro2 1.0.41", - "quote 1.0.18", + "proc-macro2 1.0.85", + "quote 1.0.36", "syn 1.0.98", ] @@ -2864,7 +2872,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e322c04a9e3440c327fca7b6c8a63e6890a32fa2ad689db972425f07e0d22abb" dependencies = [ "autocfg", - "bitflags", + "bitflags 1.3.2", "cfg-if 1.0.0", "libc", "memoffset", @@ -2949,8 +2957,8 @@ version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "876a53fff98e03a936a674b29568b0e605f06b29372c2489ff4de23f1949743d" dependencies = [ - "proc-macro2 1.0.41", - "quote 1.0.18", + "proc-macro2 1.0.85", + "quote 1.0.36", "syn 1.0.98", ] @@ -3022,8 +3030,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3b0498641e53dd6ac1a4f22547548caa6864cc4933784319cd1775271c5a46ce" dependencies = [ "proc-macro-crate 1.1.0", - "proc-macro2 1.0.41", - "quote 1.0.18", + "proc-macro2 1.0.85", + "quote 1.0.36", "syn 1.0.98", ] @@ -3075,7 +3083,7 @@ version = "0.10.41" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "618febf65336490dfcf20b73f885f5651a0c89c64c2d4a8c3662585a70bf5bd0" dependencies = [ - "bitflags", + "bitflags 1.3.2", "cfg-if 1.0.0", "foreign-types", "libc", @@ -3090,8 +3098,8 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b501e44f11665960c7e7fcf062c7d96a14ade4aa98116c004b2e37b5be7d736c" dependencies = [ - "proc-macro2 1.0.41", - "quote 1.0.18", + "proc-macro2 1.0.85", + "quote 1.0.36", "syn 1.0.98", ] @@ -3171,8 +3179,8 @@ checksum = "084fd65d5dd8b3772edccb5ffd1e4b7eba43897ecd0f9401e330e8c542959408" dependencies = [ "Inflector", "proc-macro-error", - "proc-macro2 1.0.41", - "quote 1.0.18", + "proc-macro2 1.0.85", + "quote 1.0.36", "syn 1.0.98", ] @@ -3262,12 +3270,6 @@ dependencies = [ "digest 0.10.3", ] -[[package]] -name = "peeking_take_while" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099" - [[package]] name = "pem" version = "1.1.0" @@ -3325,8 +3327,8 @@ checksum = "99b8db626e31e5b81787b9783425769681b347011cc59471e33ea46d2ea0cf55" dependencies = [ "pest", "pest_meta", - "proc-macro2 1.0.41", - "quote 1.0.18", + "proc-macro2 1.0.85", + "quote 1.0.36", "syn 1.0.98", ] @@ -3376,8 +3378,8 @@ version = "1.0.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6e8fe8163d14ce7f0cdac2e040116f22eac817edabff0be91e8aff7e9accf389" dependencies = [ - "proc-macro2 1.0.41", - "quote 1.0.18", + "proc-macro2 1.0.85", + "quote 1.0.36", "syn 1.0.98", ] @@ -3476,7 +3478,7 @@ version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3b83ec2d0af5c5c556257ff52c9f98934e243b9fd39604bfb2a9b75ec2e97f18" dependencies = [ - "proc-macro2 1.0.41", + "proc-macro2 1.0.85", "syn 1.0.98", ] @@ -3506,8 +3508,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" dependencies = [ "proc-macro-error-attr", - "proc-macro2 1.0.41", - "quote 1.0.18", + "proc-macro2 1.0.85", + "quote 1.0.36", "syn 1.0.98", "version_check", ] @@ -3518,8 +3520,8 @@ version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" dependencies = [ - "proc-macro2 1.0.41", - "quote 1.0.18", + "proc-macro2 1.0.85", + "quote 1.0.36", "version_check", ] @@ -3534,9 +3536,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.41" +version = "1.0.85" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cdcc2916cde080c1876ff40292a396541241fe0072ef928cd76582e9ea5d60d2" +checksum = "22244ce15aa966053a896d1accb3a6e68469b97c7f33f284b99f0d576879fc23" dependencies = [ "unicode-ident", ] @@ -3548,7 +3550,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1e0d9cc07f18492d879586c92b485def06bc850da3118075cd45d50e9c95b0e5" dependencies = [ "bit-set", - "bitflags", + "bitflags 1.3.2", "byteorder", "lazy_static", "num-traits", @@ -3629,8 +3631,8 @@ checksum = "f9cc1a3263e07e0bf68e96268f37665207b49560d98739662cdfaae215c720fe" dependencies = [ "anyhow", "itertools", - "proc-macro2 1.0.41", - "quote 1.0.18", + "proc-macro2 1.0.85", + "quote 1.0.36", "syn 1.0.98", ] @@ -3642,8 +3644,8 @@ checksum = "7345d5f0e08c0536d7ac7229952590239e77abf0a0100a1b1d890add6ea96364" dependencies = [ "anyhow", "itertools", - "proc-macro2 1.0.41", - "quote 1.0.18", + "proc-macro2 1.0.85", + "quote 1.0.36", "syn 1.0.98", ] @@ -3761,11 +3763,11 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.18" +version = "1.0.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1feb54ed693b93a84e14094943b84b7c4eae204c512b7ccb95ab0c66d278ad1" +checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" dependencies = [ - "proc-macro2 1.0.41", + "proc-macro2 1.0.85", ] [[package]] @@ -3956,7 +3958,7 @@ version = "0.2.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8383f39639269cde97d255a32bdb68c047337295414940c68bdd30c2e13203ff" dependencies = [ - "bitflags", + "bitflags 1.3.2", ] [[package]] @@ -4077,9 +4079,9 @@ dependencies = [ [[package]] name = "rocksdb" -version = "0.19.0" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e9562ea1d70c0cc63a34a22d977753b50cca91cc6b6527750463bd5dd8697bc" +checksum = "6bd13e55d6d7b8cd0ea569161127567cd587676c99f4472f779a0279aa60a7a7" dependencies = [ "libc", "librocksdb-sys", @@ -4140,7 +4142,7 @@ version = "0.35.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "72c825b8aa8010eb9ee99b75f05e10180b9278d161583034d7574c9d617aeada" dependencies = [ - "bitflags", + "bitflags 1.3.2", "errno", "io-lifetimes", "libc", @@ -4267,8 +4269,8 @@ version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bdbda6ac5cd1321e724fa9cee216f3a61885889b896f073b8f82322789c5250e" dependencies = [ - "proc-macro2 1.0.41", - "quote 1.0.18", + "proc-macro2 1.0.85", + "quote 1.0.36", "syn 1.0.98", ] @@ -4298,7 +4300,7 @@ version = "2.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "525bc1abfda2e1998d152c45cf13e696f76d0a4972310b22fac1658b05df7c87" dependencies = [ - "bitflags", + "bitflags 1.3.2", "core-foundation", "core-foundation-sys", "libc", @@ -4366,8 +4368,8 @@ version = "1.0.144" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "94ed3a816fb1d101812f83e789f888322c34e291f894f19590dc310963e87a00" dependencies = [ - "proc-macro2 1.0.41", - "quote 1.0.18", + "proc-macro2 1.0.85", + "quote 1.0.36", "syn 1.0.98", ] @@ -4440,8 +4442,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4b6f5d1c3087fb119617cff2966fe3808a80e5eb59a8c1601d5994d66f4346a5" dependencies = [ "proc-macro-error", - "proc-macro2 1.0.41", - "quote 1.0.18", + "proc-macro2 1.0.85", + "quote 1.0.36", "syn 1.0.98", ] @@ -5408,8 +5410,8 @@ version = "1.14.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b6fae474ab37e2ccc4dfd33edd36a05d7df02b8531fa9870cb244f9491b64fe3" dependencies = [ - "proc-macro2 1.0.41", - "quote 1.0.18", + "proc-macro2 1.0.85", + "quote 1.0.36", "rustc_version 0.4.0", "syn 1.0.98", ] @@ -5418,8 +5420,8 @@ dependencies = [ name = "solana-frozen-abi-macro" version = "1.15.0" dependencies = [ - "proc-macro2 1.0.41", - "quote 1.0.18", + "proc-macro2 1.0.85", + "quote 1.0.36", "rustc_version 0.4.0", "syn 1.0.98", ] @@ -5589,7 +5591,7 @@ version = "1.15.0" dependencies = [ "assert_matches", "bincode", - "bitflags", + "bitflags 1.3.2", "bs58", "byteorder", "chrono", @@ -5914,7 +5916,7 @@ checksum = "f480a0a440ea15d8436de1c9ac01501cb15979dae4a0a5fc8e33198949b38681" dependencies = [ "base64 0.13.0", "bincode", - "bitflags", + "bitflags 1.3.2", "blake3", "borsh", "borsh-derive", @@ -5967,7 +5969,7 @@ dependencies = [ "assert_matches", "base64 0.13.0", "bincode", - "bitflags", + "bitflags 1.3.2", "blake3", "borsh", "borsh-derive", @@ -6369,7 +6371,7 @@ dependencies = [ "assert_matches", "base64 0.13.0", "bincode", - "bitflags", + "bitflags 1.3.2", "borsh", "bs58", "bytemuck", @@ -6419,7 +6421,7 @@ dependencies = [ "assert_matches", "base64 0.13.0", "bincode", - "bitflags", + "bitflags 1.3.2", "borsh", "bs58", "bytemuck", @@ -6473,8 +6475,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "768f16d1a7315fc66ba835eebf9e95a83365ac94222551bc5cdcc6a74cb4a137" dependencies = [ "bs58", - "proc-macro2 1.0.41", - "quote 1.0.18", + "proc-macro2 1.0.85", + "quote 1.0.36", "rustversion", "syn 1.0.98", ] @@ -6484,8 +6486,8 @@ name = "solana-sdk-macro" version = "1.15.0" dependencies = [ "bs58", - "proc-macro2 1.0.41", - "quote 1.0.18", + "proc-macro2 1.0.85", + "quote 1.0.36", "rustversion", "syn 1.0.98", ] @@ -7157,8 +7159,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6878079b17446e4d3eba6192bb0a2950d5b14f0ed8424b852310e5a94345d0ef" dependencies = [ "heck 0.4.0", - "proc-macro2 1.0.41", - "quote 1.0.18", + "proc-macro2 1.0.85", + "quote 1.0.36", "rustversion", "syn 1.0.98", ] @@ -7192,8 +7194,19 @@ version = "1.0.98" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c50aef8a904de4c23c788f104b7dddc7d6f79c647c7c8ce4cc8f73eb0ca773dd" dependencies = [ - "proc-macro2 1.0.41", - "quote 1.0.18", + "proc-macro2 1.0.85", + "quote 1.0.36", + "unicode-ident", +] + +[[package]] +name = "syn" +version = "2.0.66" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c42f3f41a2de00b01c0aaad383c5a45241efc8b2d1eda5661812fda5f3cdcff5" +dependencies = [ + "proc-macro2 1.0.85", + "quote 1.0.36", "unicode-ident", ] @@ -7209,8 +7222,8 @@ version = "0.12.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f36bdaa60a83aca3921b5259d5400cbf5e90fc51931376a9bd4a0eb79aa7210f" dependencies = [ - "proc-macro2 1.0.41", - "quote 1.0.18", + "proc-macro2 1.0.85", + "quote 1.0.36", "syn 1.0.98", "unicode-xid 0.2.2", ] @@ -7231,7 +7244,7 @@ version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1123645dfaf2b5eac6b6c88addafc359c789b8ef2a770ecaef758c1ddf363ea4" dependencies = [ - "bitflags", + "bitflags 1.3.2", "byteorder", "libc", "thiserror", @@ -7293,8 +7306,8 @@ version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0ee42b4e559f17bce0385ebf511a7beb67d5cc33c12c96b7f4e9789919d9c10f" dependencies = [ - "proc-macro2 1.0.41", - "quote 1.0.18", + "proc-macro2 1.0.85", + "quote 1.0.36", "syn 1.0.98", ] @@ -7354,8 +7367,8 @@ checksum = "e45b7bf6e19353ddd832745c8fcf77a17a93171df7151187f26623f2b75b5b26" dependencies = [ "cfg-if 1.0.0", "proc-macro-error", - "proc-macro2 1.0.41", - "quote 1.0.18", + "proc-macro2 1.0.85", + "quote 1.0.36", "syn 1.0.98", ] @@ -7389,8 +7402,8 @@ version = "1.0.31" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0396bc89e626244658bef819e22d0cc459e795a5ebe878e6ec336d1674a8d79a" dependencies = [ - "proc-macro2 1.0.41", - "quote 1.0.18", + "proc-macro2 1.0.85", + "quote 1.0.36", "syn 1.0.98", ] @@ -7528,8 +7541,8 @@ version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b557f72f448c511a979e2564e55d74e6c4432fc96ff4f6241bc6bded342643b7" dependencies = [ - "proc-macro2 1.0.41", - "quote 1.0.18", + "proc-macro2 1.0.85", + "quote 1.0.36", "syn 1.0.98", ] @@ -7719,9 +7732,9 @@ version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9403f1bafde247186684b230dc6f38b5cd514584e8bec1dd32514be4745fa757" dependencies = [ - "proc-macro2 1.0.41", + "proc-macro2 1.0.85", "prost-build 0.9.0", - "quote 1.0.18", + "quote 1.0.36", "syn 1.0.98", ] @@ -7732,9 +7745,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2fbcd2800e34e743b9ae795867d5f77b535d3a3be69fd731e39145719752df8c" dependencies = [ "prettyplease", - "proc-macro2 1.0.41", + "proc-macro2 1.0.85", "prost-build 0.11.0", - "quote 1.0.18", + "quote 1.0.36", "syn 1.0.98", ] @@ -7764,7 +7777,7 @@ version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "aba3f3efabf7fb41fae8534fc20a817013dd1c12cb45441efb6c82e6556b4cd8" dependencies = [ - "bitflags", + "bitflags 1.3.2", "bytes", "futures-core", "futures-util", @@ -7808,8 +7821,8 @@ version = "0.1.18" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f4f480b8f81512e825f337ad51e94c1eb5d3bbdf2b363dcd01e2b19a9ffe3f8e" dependencies = [ - "proc-macro2 1.0.41", - "quote 1.0.18", + "proc-macro2 1.0.85", + "quote 1.0.36", "syn 1.0.98", ] @@ -8135,8 +8148,8 @@ dependencies = [ "bumpalo", "log", "once_cell", - "proc-macro2 1.0.41", - "quote 1.0.18", + "proc-macro2 1.0.85", + "quote 1.0.36", "syn 1.0.98", "wasm-bindgen-shared", ] @@ -8159,7 +8172,7 @@ version = "0.2.82" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b260f13d3012071dfb1512849c033b1925038373aea48ced3012c09df952c602" dependencies = [ - "quote 1.0.18", + "quote 1.0.36", "wasm-bindgen-macro-support", ] @@ -8169,8 +8182,8 @@ version = "0.2.82" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5be8e654bdd9b79216c2929ab90721aa82faf65c48cdf08bdc4e7f51357b80da" dependencies = [ - "proc-macro2 1.0.41", - "quote 1.0.18", + "proc-macro2 1.0.85", + "quote 1.0.36", "syn 1.0.98", "wasm-bindgen-backend", "wasm-bindgen-shared", @@ -8430,8 +8443,8 @@ version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bdff2024a851a322b08f179173ae2ba620445aef1e838f0c196820eade4ae0c7" dependencies = [ - "proc-macro2 1.0.41", - "quote 1.0.18", + "proc-macro2 1.0.85", + "quote 1.0.36", "syn 1.0.98", "synstructure", ] diff --git a/ci/docker-rust-nightly/Dockerfile b/ci/docker-rust-nightly/Dockerfile index 5285956e55..a9a6abb2b7 100644 --- a/ci/docker-rust-nightly/Dockerfile +++ b/ci/docker-rust-nightly/Dockerfile @@ -1,4 +1,4 @@ -FROM solanalabs/rust:1.65.0 +FROM solanalabs/rust:1.66.0 ARG date RUN set -x \ diff --git a/ci/docker-rust/Dockerfile b/ci/docker-rust/Dockerfile index d8713dbe02..4a65e69f31 100644 --- a/ci/docker-rust/Dockerfile +++ b/ci/docker-rust/Dockerfile @@ -1,6 +1,6 @@ # Note: when the rust version is changed also modify # ci/rust-version.sh to pick up the new image tag -FROM rust:1.65.0 +FROM rust:1.66.0 # Add Google Protocol Buffers for Libra's metrics library. ENV PROTOC_VERSION 3.8.0 diff --git a/ledger/Cargo.toml b/ledger/Cargo.toml index 3abbbf1b1d..9fa2597335 100644 --- a/ledger/Cargo.toml +++ b/ledger/Cargo.toml @@ -64,7 +64,7 @@ trees = "0.4.2" [dependencies.rocksdb] # Avoid the vendored bzip2 within rocksdb-sys that can cause linker conflicts # when also using the bzip2 crate -version = "0.19.0" +version = "0.22.0" default-features = false features = ["lz4"] diff --git a/ledger/src/blockstore_db.rs b/ledger/src/blockstore_db.rs index 7801babc93..01cb4c073b 100644 --- a/ledger/src/blockstore_db.rs +++ b/ledger/src/blockstore_db.rs @@ -1821,7 +1821,7 @@ fn get_db_options(access_type: &AccessType) -> Options { // Per the docs, a good value for this is the number of cores on the machine options.increase_parallelism(num_cpus::get() as i32); - let mut env = rocksdb::Env::default().unwrap(); + let mut env = rocksdb::Env::new().unwrap(); // While a compaction is ongoing, all the background threads // could be used by the compaction. This can stall writes which // need to flush the memtable. Add some high-priority background threads diff --git a/rust-toolchain.toml b/rust-toolchain.toml index f8c2abbb3d..1e087e17b8 100644 --- a/rust-toolchain.toml +++ b/rust-toolchain.toml @@ -1,2 +1,2 @@ [toolchain] -channel = "1.65.0" +channel = "1.66.0"