From b5b48eeb72a1824b0d48f1cca3ba59b518932153 Mon Sep 17 00:00:00 2001 From: Illia Bobyr Date: Tue, 17 Oct 2023 01:12:15 -0700 Subject: [PATCH] Cargo.toml: Sort dependency and feature lists (#33670) Keeping these sorted reduces merge conflicts. --- Cargo.toml | 18 +++++++++--------- frozen-abi/Cargo.toml | 2 +- geyser-plugin-manager/Cargo.toml | 1 - programs/sbf/Cargo.toml | 2 +- remote-wallet/Cargo.toml | 6 +++--- sdk/program/Cargo.toml | 4 ++-- 6 files changed, 16 insertions(+), 17 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 2ab74f105eadc2..32b3f9df7c9f46 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -133,6 +133,7 @@ license = "Apache-2.0" edition = "2021" [workspace.dependencies] +Inflector = "0.11.4" aes-gcm-siv = "0.10.3" ahash = "0.8.3" anyhow = "1.0.75" @@ -198,8 +199,8 @@ fast-math = "0.1" fd-lock = "3.0.13" flate2 = "1.0.28" fnv = "1.0.7" -fs_extra = "1.3.0" fs-err = "2.9.0" +fs_extra = "1.3.0" futures = "0.3.28" futures-util = "0.3.28" gag = "1.0.0" @@ -219,7 +220,6 @@ im = "15.1.0" index_list = "0.2.7" indexmap = "2.0.2" indicatif = "0.17.7" -Inflector = "0.11.4" itertools = "0.10.5" jemallocator = { package = "tikv-jemallocator", version = "0.4.1", features = ["unprefixed_malloc_on_supported_platforms"] } js-sys = "0.3.64" @@ -246,10 +246,10 @@ min-max-heap = "1.3.0" modular-bitfield = "0.11.2" nix = "0.26.4" num-bigint = "0.4.4" -num_cpus = "1.16.0" -num_enum = "0.7.0" num-derive = "0.4" num-traits = "0.2" +num_cpus = "1.16.0" +num_enum = "0.7.0" openssl = "0.10" ouroboros = "0.15.6" parking_lot = "0.12" @@ -278,8 +278,8 @@ rayon = "1.8.0" rcgen = "0.10.0" reed-solomon-erasure = "6.0.0" regex = "1.10.1" -rolling-file = "0.2.0" reqwest = { version = "0.11.22", default-features = false } +rolling-file = "0.2.0" rpassword = "7.2" rustc_version = "0.4" rustls = { version = "0.21.7", default-features = false, features = ["quic"] } @@ -290,9 +290,9 @@ serde = "1.0.189" serde_bytes = "0.11.12" serde_derive = "1.0.103" serde_json = "1.0.107" +serde_with = { version = "2.3.3", default-features = false } serde_yaml = "0.9.25" serial_test = "2.0.0" -serde_with = { version = "2.3.3", default-features = false } sha2 = "0.10.8" sha3 = "0.10.4" signal-hook = "0.3.17" @@ -300,7 +300,6 @@ siphasher = "0.3.11" smpl_jwt = "0.7.1" socket2 = "0.5.4" soketto = "0.7" -solana_rbpf = "=0.7.2" solana-account-decoder = { path = "account-decoder", version = "=1.18.0" } solana-accounts-db = { path = "accounts-db", version = "=1.18.0" } solana-address-lookup-table-program = { path = "programs/address-lookup-table", version = "=1.18.0" } @@ -312,7 +311,6 @@ solana-bloom = { path = "bloom", version = "=1.18.0" } solana-bpf-loader-program = { path = "programs/bpf_loader", version = "=1.18.0" } solana-bucket-map = { path = "bucket_map", version = "=1.18.0" } solana-cargo-registry = { path = "cargo-registry", version = "=1.18.0" } -solana-connection-cache = { path = "connection-cache", version = "=1.18.0", default-features = false } solana-clap-utils = { path = "clap-utils", version = "=1.18.0" } solana-clap-v3-utils = { path = "clap-v3-utils", version = "=1.18.0" } solana-cli = { path = "cli", version = "=1.18.0" } @@ -321,6 +319,7 @@ solana-cli-output = { path = "cli-output", version = "=1.18.0" } solana-client = { path = "client", version = "=1.18.0" } solana-compute-budget-program = { path = "programs/compute-budget", version = "=1.18.0" } solana-config-program = { path = "programs/config", version = "=1.18.0" } +solana-connection-cache = { path = "connection-cache", version = "=1.18.0", default-features = false } solana-core = { path = "core", version = "=1.18.0" } solana-cost-model = { path = "cost-model", version = "=1.18.0" } solana-download-utils = { path = "download-utils", version = "=1.18.0" } @@ -333,8 +332,8 @@ solana-genesis-utils = { path = "genesis-utils", version = "=1.18.0" } solana-geyser-plugin-interface = { path = "geyser-plugin-interface", version = "=1.18.0" } solana-geyser-plugin-manager = { path = "geyser-plugin-manager", version = "=1.18.0" } solana-gossip = { path = "gossip", version = "=1.18.0" } -solana-loader-v4-program = { path = "programs/loader-v4", version = "=1.18.0" } solana-ledger = { path = "ledger", version = "=1.18.0" } +solana-loader-v4-program = { path = "programs/loader-v4", version = "=1.18.0" } solana-local-cluster = { path = "local-cluster", version = "=1.18.0" } solana-logger = { path = "logger", version = "=1.18.0" } solana-measure = { path = "measure", version = "=1.18.0" } @@ -378,6 +377,7 @@ solana-wen-restart = { path = "wen-restart", version = "=1.18.0" } solana-zk-keygen = { path = "zk-keygen", version = "=1.18.0" } solana-zk-token-proof-program = { path = "programs/zk-token-proof", version = "=1.18.0" } solana-zk-token-sdk = { path = "zk-token-sdk", version = "=1.18.0" } +solana_rbpf = "=0.7.2" spl-associated-token-account = "=2.2.0" spl-instruction-padding = "0.1" spl-memo = "=4.0.0" diff --git a/frozen-abi/Cargo.toml b/frozen-abi/Cargo.toml index 4a4029ceb843d4..25272a04b80b7b 100644 --- a/frozen-abi/Cargo.toml +++ b/frozen-abi/Cargo.toml @@ -30,8 +30,8 @@ memmap2 = { workspace = true } subtle = { workspace = true } [target.'cfg(not(target_os = "solana"))'.dev-dependencies] -solana-logger = { workspace = true } bitflags = { workspace = true } +solana-logger = { workspace = true } [build-dependencies] rustc_version = { workspace = true } diff --git a/geyser-plugin-manager/Cargo.toml b/geyser-plugin-manager/Cargo.toml index 9b4468eddaea9b..d905248150b717 100644 --- a/geyser-plugin-manager/Cargo.toml +++ b/geyser-plugin-manager/Cargo.toml @@ -10,7 +10,6 @@ license = { workspace = true } edition = { workspace = true } [dependencies] - bs58 = { workspace = true } crossbeam-channel = { workspace = true } json5 = { workspace = true } diff --git a/programs/sbf/Cargo.toml b/programs/sbf/Cargo.toml index 509d750cd41d29..507bf01385e44c 100644 --- a/programs/sbf/Cargo.toml +++ b/programs/sbf/Cargo.toml @@ -25,7 +25,6 @@ rand = "0.8" rustversion = "1.0.14" serde = "1.0.112" serde_json = "1.0.56" -solana_rbpf = "=0.7.2" solana-account-decoder = { path = "../../account-decoder", version = "=1.18.0" } solana-accounts-db = { path = "../../accounts-db", version = "=1.18.0" } solana-bpf-loader-program = { path = "../bpf_loader", version = "=1.18.0" } @@ -49,6 +48,7 @@ solana-sdk = { path = "../../sdk", version = "=1.18.0" } solana-transaction-status = { path = "../../transaction-status", version = "=1.18.0" } solana-validator = { path = "../../validator", version = "=1.18.0" } solana-zk-token-sdk = { path = "../../zk-token-sdk", version = "=1.18.0" } +solana_rbpf = "=0.7.2" static_assertions = "1.1.0" thiserror = "1.0" diff --git a/remote-wallet/Cargo.toml b/remote-wallet/Cargo.toml index 21fecb564b21fd..8cea360d7c14ca 100644 --- a/remote-wallet/Cargo.toml +++ b/remote-wallet/Cargo.toml @@ -28,10 +28,10 @@ assert_matches = { workspace = true } [features] default = ["linux-static-hidraw", "hidapi"] -linux-static-libusb = ["hidapi/linux-static-libusb"] -linux-static-hidraw = ["hidapi/linux-static-hidraw"] -linux-shared-libusb = ["hidapi/linux-shared-libusb"] linux-shared-hidraw = ["hidapi/linux-shared-hidraw"] +linux-shared-libusb = ["hidapi/linux-shared-libusb"] +linux-static-hidraw = ["hidapi/linux-static-hidraw"] +linux-static-libusb = ["hidapi/linux-static-libusb"] [[bin]] name = "solana-ledger-udev" diff --git a/sdk/program/Cargo.toml b/sdk/program/Cargo.toml index 8d178ec86f525f..3f73eaf1d76c27 100644 --- a/sdk/program/Cargo.toml +++ b/sdk/program/Cargo.toml @@ -51,8 +51,8 @@ ark-bn254 = { workspace = true } ark-ec = { workspace = true } ark-ff = { workspace = true } ark-serialize = { workspace = true } -bitflags = { workspace = true } base64 = { workspace = true, features = ["alloc", "std"] } +bitflags = { workspace = true } curve25519-dalek = { workspace = true, features = ["serde"] } itertools = { workspace = true } libc = { workspace = true, features = ["extra_traits"] } @@ -70,8 +70,8 @@ solana-logger = { workspace = true } [target.'cfg(target_arch = "wasm32")'.dependencies] console_error_panic_hook = { workspace = true } console_log = { workspace = true } -js-sys = { workspace = true } getrandom = { workspace = true, features = ["js", "wasm-bindgen"] } +js-sys = { workspace = true } [target.'cfg(not(target_pointer_width = "64"))'.dependencies] parking_lot = { workspace = true }