removes outdated matches crate from dependencies (#33172)
removes outdated matches crate from the dependencies std::matches has been stable since rust 1.42.0. Other use-cases are covered by assert_matches crate.
This commit is contained in:
parent
f4816dc0cf
commit
528a03f32a
|
@ -5722,6 +5722,7 @@ dependencies = [
|
||||||
name = "solana-core"
|
name = "solana-core"
|
||||||
version = "1.17.0"
|
version = "1.17.0"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
|
"assert_matches",
|
||||||
"base64 0.21.3",
|
"base64 0.21.3",
|
||||||
"bincode",
|
"bincode",
|
||||||
"bs58",
|
"bs58",
|
||||||
|
@ -5737,7 +5738,6 @@ dependencies = [
|
||||||
"lazy_static",
|
"lazy_static",
|
||||||
"log",
|
"log",
|
||||||
"lru",
|
"lru",
|
||||||
"matches",
|
|
||||||
"min-max-heap",
|
"min-max-heap",
|
||||||
"num_enum 0.6.1",
|
"num_enum 0.6.1",
|
||||||
"quinn",
|
"quinn",
|
||||||
|
@ -5879,12 +5879,12 @@ dependencies = [
|
||||||
name = "solana-entry"
|
name = "solana-entry"
|
||||||
version = "1.17.0"
|
version = "1.17.0"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
|
"assert_matches",
|
||||||
"bincode",
|
"bincode",
|
||||||
"crossbeam-channel",
|
"crossbeam-channel",
|
||||||
"dlopen2",
|
"dlopen2",
|
||||||
"lazy_static",
|
"lazy_static",
|
||||||
"log",
|
"log",
|
||||||
"matches",
|
|
||||||
"rand 0.8.5",
|
"rand 0.8.5",
|
||||||
"rayon",
|
"rayon",
|
||||||
"serde",
|
"serde",
|
||||||
|
@ -6033,6 +6033,7 @@ dependencies = [
|
||||||
name = "solana-gossip"
|
name = "solana-gossip"
|
||||||
version = "1.17.0"
|
version = "1.17.0"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
|
"assert_matches",
|
||||||
"bincode",
|
"bincode",
|
||||||
"bv",
|
"bv",
|
||||||
"clap 2.33.3",
|
"clap 2.33.3",
|
||||||
|
@ -6042,7 +6043,6 @@ dependencies = [
|
||||||
"itertools",
|
"itertools",
|
||||||
"log",
|
"log",
|
||||||
"lru",
|
"lru",
|
||||||
"matches",
|
|
||||||
"num-traits",
|
"num-traits",
|
||||||
"num_cpus",
|
"num_cpus",
|
||||||
"rand 0.8.5",
|
"rand 0.8.5",
|
||||||
|
@ -6151,7 +6151,6 @@ dependencies = [
|
||||||
"libc",
|
"libc",
|
||||||
"log",
|
"log",
|
||||||
"lru",
|
"lru",
|
||||||
"matches",
|
|
||||||
"num_cpus",
|
"num_cpus",
|
||||||
"num_enum 0.6.1",
|
"num_enum 0.6.1",
|
||||||
"prost",
|
"prost",
|
||||||
|
@ -6349,7 +6348,6 @@ version = "1.17.0"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"fast-math",
|
"fast-math",
|
||||||
"hex",
|
"hex",
|
||||||
"matches",
|
|
||||||
"solana-program",
|
"solana-program",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
@ -6415,6 +6413,7 @@ name = "solana-perf"
|
||||||
version = "1.17.0"
|
version = "1.17.0"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"ahash 0.8.3",
|
"ahash 0.8.3",
|
||||||
|
"assert_matches",
|
||||||
"bincode",
|
"bincode",
|
||||||
"bv",
|
"bv",
|
||||||
"caps",
|
"caps",
|
||||||
|
@ -6424,7 +6423,6 @@ dependencies = [
|
||||||
"lazy_static",
|
"lazy_static",
|
||||||
"libc",
|
"libc",
|
||||||
"log",
|
"log",
|
||||||
"matches",
|
|
||||||
"nix 0.26.4",
|
"nix 0.26.4",
|
||||||
"rand 0.8.5",
|
"rand 0.8.5",
|
||||||
"rand_chacha 0.3.1",
|
"rand_chacha 0.3.1",
|
||||||
|
@ -6442,11 +6440,11 @@ dependencies = [
|
||||||
name = "solana-poh"
|
name = "solana-poh"
|
||||||
version = "1.17.0"
|
version = "1.17.0"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
|
"assert_matches",
|
||||||
"bincode",
|
"bincode",
|
||||||
"core_affinity",
|
"core_affinity",
|
||||||
"crossbeam-channel",
|
"crossbeam-channel",
|
||||||
"log",
|
"log",
|
||||||
"matches",
|
|
||||||
"rand 0.8.5",
|
"rand 0.8.5",
|
||||||
"solana-entry",
|
"solana-entry",
|
||||||
"solana-ledger",
|
"solana-ledger",
|
||||||
|
@ -7276,6 +7274,7 @@ dependencies = [
|
||||||
name = "solana-turbine"
|
name = "solana-turbine"
|
||||||
version = "1.17.0"
|
version = "1.17.0"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
|
"assert_matches",
|
||||||
"bincode",
|
"bincode",
|
||||||
"bytes",
|
"bytes",
|
||||||
"crossbeam-channel",
|
"crossbeam-channel",
|
||||||
|
@ -7283,7 +7282,6 @@ dependencies = [
|
||||||
"itertools",
|
"itertools",
|
||||||
"log",
|
"log",
|
||||||
"lru",
|
"lru",
|
||||||
"matches",
|
|
||||||
"quinn",
|
"quinn",
|
||||||
"rand 0.8.5",
|
"rand 0.8.5",
|
||||||
"rand_chacha 0.3.1",
|
"rand_chacha 0.3.1",
|
||||||
|
|
|
@ -231,7 +231,6 @@ light-poseidon = "0.1.1"
|
||||||
log = "0.4.20"
|
log = "0.4.20"
|
||||||
lru = "0.7.7"
|
lru = "0.7.7"
|
||||||
lz4 = "1.24.0"
|
lz4 = "1.24.0"
|
||||||
matches = "0.1.10"
|
|
||||||
memmap2 = "0.5.10"
|
memmap2 = "0.5.10"
|
||||||
memoffset = "0.9"
|
memoffset = "0.9"
|
||||||
merlin = "3"
|
merlin = "3"
|
||||||
|
|
|
@ -76,8 +76,8 @@ tokio = { workspace = true, features = ["full"] }
|
||||||
trees = { workspace = true }
|
trees = { workspace = true }
|
||||||
|
|
||||||
[dev-dependencies]
|
[dev-dependencies]
|
||||||
|
assert_matches = { workspace = true }
|
||||||
fs_extra = { workspace = true }
|
fs_extra = { workspace = true }
|
||||||
matches = { workspace = true }
|
|
||||||
raptorq = { workspace = true }
|
raptorq = { workspace = true }
|
||||||
serde_json = { workspace = true }
|
serde_json = { workspace = true }
|
||||||
serial_test = { workspace = true }
|
serial_test = { workspace = true }
|
||||||
|
|
|
@ -69,4 +69,4 @@ extern crate solana_frozen_abi_macro;
|
||||||
|
|
||||||
#[cfg(test)]
|
#[cfg(test)]
|
||||||
#[macro_use]
|
#[macro_use]
|
||||||
extern crate matches;
|
extern crate assert_matches;
|
||||||
|
|
|
@ -26,7 +26,7 @@ solana-rayon-threadlimit = { workspace = true }
|
||||||
solana-sdk = { workspace = true }
|
solana-sdk = { workspace = true }
|
||||||
|
|
||||||
[dev-dependencies]
|
[dev-dependencies]
|
||||||
matches = { workspace = true }
|
assert_matches = { workspace = true }
|
||||||
solana-logger = { workspace = true }
|
solana-logger = { workspace = true }
|
||||||
|
|
||||||
[lib]
|
[lib]
|
||||||
|
|
|
@ -128,7 +128,7 @@ pub fn compute_hashes_per_tick(duration: Duration, hashes_sample_size: u64) -> u
|
||||||
mod tests {
|
mod tests {
|
||||||
use {
|
use {
|
||||||
crate::poh::{Poh, PohEntry},
|
crate::poh::{Poh, PohEntry},
|
||||||
matches::assert_matches,
|
assert_matches::assert_matches,
|
||||||
solana_sdk::hash::{hash, hashv, Hash},
|
solana_sdk::hash::{hash, hashv, Hash},
|
||||||
std::time::Duration,
|
std::time::Duration,
|
||||||
};
|
};
|
||||||
|
|
|
@ -10,6 +10,7 @@ license = { workspace = true }
|
||||||
edition = { workspace = true }
|
edition = { workspace = true }
|
||||||
|
|
||||||
[dependencies]
|
[dependencies]
|
||||||
|
assert_matches = { workspace = true }
|
||||||
bincode = { workspace = true }
|
bincode = { workspace = true }
|
||||||
bv = { workspace = true, features = ["serde"] }
|
bv = { workspace = true, features = ["serde"] }
|
||||||
clap = { workspace = true }
|
clap = { workspace = true }
|
||||||
|
@ -19,7 +20,6 @@ indexmap = { workspace = true, features = ["rayon"] }
|
||||||
itertools = { workspace = true }
|
itertools = { workspace = true }
|
||||||
log = { workspace = true }
|
log = { workspace = true }
|
||||||
lru = { workspace = true }
|
lru = { workspace = true }
|
||||||
matches = { workspace = true }
|
|
||||||
num-traits = { workspace = true }
|
num-traits = { workspace = true }
|
||||||
rand = { workspace = true }
|
rand = { workspace = true }
|
||||||
rand_chacha = { workspace = true }
|
rand_chacha = { workspace = true }
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
use {
|
use {
|
||||||
crate::crds_value::MAX_WALLCLOCK,
|
crate::crds_value::MAX_WALLCLOCK,
|
||||||
matches::{assert_matches, debug_assert_matches},
|
assert_matches::{assert_matches, debug_assert_matches},
|
||||||
serde::{Deserialize, Deserializer, Serialize},
|
serde::{Deserialize, Deserializer, Serialize},
|
||||||
solana_sdk::{
|
solana_sdk::{
|
||||||
pubkey::Pubkey,
|
pubkey::Pubkey,
|
||||||
|
|
|
@ -32,13 +32,13 @@ use {
|
||||||
crds_value::{CrdsData, CrdsValue, CrdsValueLabel},
|
crds_value::{CrdsData, CrdsValue, CrdsValueLabel},
|
||||||
legacy_contact_info::LegacyContactInfo as ContactInfo,
|
legacy_contact_info::LegacyContactInfo as ContactInfo,
|
||||||
},
|
},
|
||||||
|
assert_matches::debug_assert_matches,
|
||||||
bincode::serialize,
|
bincode::serialize,
|
||||||
indexmap::{
|
indexmap::{
|
||||||
map::{rayon::ParValues, Entry, IndexMap},
|
map::{rayon::ParValues, Entry, IndexMap},
|
||||||
set::IndexSet,
|
set::IndexSet,
|
||||||
},
|
},
|
||||||
lru::LruCache,
|
lru::LruCache,
|
||||||
matches::debug_assert_matches,
|
|
||||||
rayon::{prelude::*, ThreadPool},
|
rayon::{prelude::*, ThreadPool},
|
||||||
solana_sdk::{
|
solana_sdk::{
|
||||||
clock::Slot,
|
clock::Slot,
|
||||||
|
|
|
@ -31,7 +31,7 @@ extern crate log;
|
||||||
|
|
||||||
#[cfg(test)]
|
#[cfg(test)]
|
||||||
#[macro_use]
|
#[macro_use]
|
||||||
extern crate matches;
|
extern crate assert_matches;
|
||||||
|
|
||||||
#[macro_use]
|
#[macro_use]
|
||||||
extern crate serde_derive;
|
extern crate serde_derive;
|
||||||
|
|
|
@ -75,7 +75,6 @@ features = ["lz4"]
|
||||||
|
|
||||||
[dev-dependencies]
|
[dev-dependencies]
|
||||||
bs58 = { workspace = true }
|
bs58 = { workspace = true }
|
||||||
matches = { workspace = true }
|
|
||||||
solana-account-decoder = { workspace = true }
|
solana-account-decoder = { workspace = true }
|
||||||
solana-logger = { workspace = true }
|
solana-logger = { workspace = true }
|
||||||
test-case = { workspace = true }
|
test-case = { workspace = true }
|
||||||
|
|
|
@ -1859,7 +1859,7 @@ pub mod tests {
|
||||||
create_genesis_config, create_genesis_config_with_leader, GenesisConfigInfo,
|
create_genesis_config, create_genesis_config_with_leader, GenesisConfigInfo,
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
matches::assert_matches,
|
assert_matches::assert_matches,
|
||||||
rand::{thread_rng, Rng},
|
rand::{thread_rng, Rng},
|
||||||
solana_entry::entry::{create_ticks, next_entry, next_entry_mut},
|
solana_entry::entry::{create_ticks, next_entry, next_entry_mut},
|
||||||
solana_program_runtime::declare_process_instruction,
|
solana_program_runtime::declare_process_instruction,
|
||||||
|
|
|
@ -1031,8 +1031,8 @@ pub fn verify_test_data_shred(
|
||||||
mod tests {
|
mod tests {
|
||||||
use {
|
use {
|
||||||
super::*,
|
super::*,
|
||||||
|
assert_matches::assert_matches,
|
||||||
bincode::serialized_size,
|
bincode::serialized_size,
|
||||||
matches::assert_matches,
|
|
||||||
rand::Rng,
|
rand::Rng,
|
||||||
rand_chacha::{rand_core::SeedableRng, ChaChaRng},
|
rand_chacha::{rand_core::SeedableRng, ChaChaRng},
|
||||||
solana_sdk::{shred_version, signature::Signer, signer::keypair::keypair_from_seed},
|
solana_sdk::{shred_version, signature::Signer, signer::keypair::keypair_from_seed},
|
||||||
|
|
|
@ -330,7 +330,7 @@ mod test {
|
||||||
use {
|
use {
|
||||||
super::*,
|
super::*,
|
||||||
crate::shred::{shred_code::MAX_CODE_SHREDS_PER_SLOT, ShredType, MAX_DATA_SHREDS_PER_SLOT},
|
crate::shred::{shred_code::MAX_CODE_SHREDS_PER_SLOT, ShredType, MAX_DATA_SHREDS_PER_SLOT},
|
||||||
matches::assert_matches,
|
assert_matches::assert_matches,
|
||||||
};
|
};
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
|
|
|
@ -1052,8 +1052,8 @@ mod test {
|
||||||
use {
|
use {
|
||||||
super::*,
|
super::*,
|
||||||
crate::shred::{ShredFlags, ShredId, SignedData},
|
crate::shred::{ShredFlags, ShredId, SignedData},
|
||||||
|
assert_matches::assert_matches,
|
||||||
itertools::Itertools,
|
itertools::Itertools,
|
||||||
matches::assert_matches,
|
|
||||||
rand::{seq::SliceRandom, CryptoRng, Rng},
|
rand::{seq::SliceRandom, CryptoRng, Rng},
|
||||||
rayon::ThreadPoolBuilder,
|
rayon::ThreadPoolBuilder,
|
||||||
solana_sdk::signature::{Keypair, Signer},
|
solana_sdk::signature::{Keypair, Signer},
|
||||||
|
|
|
@ -472,8 +472,8 @@ mod tests {
|
||||||
ShredType, MAX_CODE_SHREDS_PER_SLOT,
|
ShredType, MAX_CODE_SHREDS_PER_SLOT,
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
assert_matches::assert_matches,
|
||||||
bincode::serialized_size,
|
bincode::serialized_size,
|
||||||
matches::assert_matches,
|
|
||||||
rand::{seq::SliceRandom, Rng},
|
rand::{seq::SliceRandom, Rng},
|
||||||
solana_sdk::{
|
solana_sdk::{
|
||||||
hash::{hash, Hash},
|
hash::{hash, Hash},
|
||||||
|
|
|
@ -465,7 +465,7 @@ mod tests {
|
||||||
shred::{ProcessShredsStats, Shred, ShredFlags, LEGACY_SHRED_DATA_CAPACITY},
|
shred::{ProcessShredsStats, Shred, ShredFlags, LEGACY_SHRED_DATA_CAPACITY},
|
||||||
shredder::{ReedSolomonCache, Shredder},
|
shredder::{ReedSolomonCache, Shredder},
|
||||||
},
|
},
|
||||||
matches::assert_matches,
|
assert_matches::assert_matches,
|
||||||
rand::{seq::SliceRandom, Rng},
|
rand::{seq::SliceRandom, Rng},
|
||||||
rayon::ThreadPoolBuilder,
|
rayon::ThreadPoolBuilder,
|
||||||
solana_entry::entry::Entry,
|
solana_entry::entry::Entry,
|
||||||
|
|
|
@ -13,10 +13,6 @@ edition = { workspace = true }
|
||||||
fast-math = { workspace = true }
|
fast-math = { workspace = true }
|
||||||
solana-program = { workspace = true }
|
solana-program = { workspace = true }
|
||||||
|
|
||||||
# This can go once the SBF toolchain target Rust 1.42.0+
|
|
||||||
[target.bpfel-unknown-unknown.dependencies]
|
|
||||||
matches = { workspace = true }
|
|
||||||
|
|
||||||
[dev-dependencies]
|
[dev-dependencies]
|
||||||
hex = { workspace = true }
|
hex = { workspace = true }
|
||||||
|
|
||||||
|
|
|
@ -1,8 +1,4 @@
|
||||||
#![allow(clippy::arithmetic_side_effects)]
|
#![allow(clippy::arithmetic_side_effects)]
|
||||||
|
|
||||||
#[cfg(target_os = "solana")]
|
|
||||||
#[macro_use]
|
|
||||||
extern crate matches;
|
|
||||||
|
|
||||||
pub mod merkle_tree;
|
pub mod merkle_tree;
|
||||||
pub use merkle_tree::MerkleTree;
|
pub use merkle_tree::MerkleTree;
|
||||||
|
|
|
@ -35,7 +35,7 @@ nix = { workspace = true }
|
||||||
name = "solana_perf"
|
name = "solana_perf"
|
||||||
|
|
||||||
[dev-dependencies]
|
[dev-dependencies]
|
||||||
matches = { workspace = true }
|
assert_matches = { workspace = true }
|
||||||
rand_chacha = { workspace = true }
|
rand_chacha = { workspace = true }
|
||||||
solana-logger = { workspace = true }
|
solana-logger = { workspace = true }
|
||||||
test-case = { workspace = true }
|
test-case = { workspace = true }
|
||||||
|
|
|
@ -18,7 +18,7 @@ extern crate log;
|
||||||
|
|
||||||
#[cfg(test)]
|
#[cfg(test)]
|
||||||
#[macro_use]
|
#[macro_use]
|
||||||
extern crate matches;
|
extern crate assert_matches;
|
||||||
|
|
||||||
#[macro_use]
|
#[macro_use]
|
||||||
extern crate solana_metrics;
|
extern crate solana_metrics;
|
||||||
|
|
|
@ -22,8 +22,8 @@ solana-sdk = { workspace = true }
|
||||||
thiserror = { workspace = true }
|
thiserror = { workspace = true }
|
||||||
|
|
||||||
[dev-dependencies]
|
[dev-dependencies]
|
||||||
|
assert_matches = { workspace = true }
|
||||||
bincode = { workspace = true }
|
bincode = { workspace = true }
|
||||||
matches = { workspace = true }
|
|
||||||
rand = { workspace = true }
|
rand = { workspace = true }
|
||||||
solana-logger = { workspace = true }
|
solana-logger = { workspace = true }
|
||||||
solana-perf = { workspace = true }
|
solana-perf = { workspace = true }
|
||||||
|
|
|
@ -8,4 +8,4 @@ extern crate solana_metrics;
|
||||||
|
|
||||||
#[cfg(test)]
|
#[cfg(test)]
|
||||||
#[macro_use]
|
#[macro_use]
|
||||||
extern crate matches;
|
extern crate assert_matches;
|
||||||
|
|
|
@ -5012,6 +5012,7 @@ dependencies = [
|
||||||
name = "solana-gossip"
|
name = "solana-gossip"
|
||||||
version = "1.17.0"
|
version = "1.17.0"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
|
"assert_matches",
|
||||||
"bincode",
|
"bincode",
|
||||||
"bv",
|
"bv",
|
||||||
"clap 2.33.3",
|
"clap 2.33.3",
|
||||||
|
@ -5021,7 +5022,6 @@ dependencies = [
|
||||||
"itertools",
|
"itertools",
|
||||||
"log",
|
"log",
|
||||||
"lru",
|
"lru",
|
||||||
"matches",
|
|
||||||
"num-traits",
|
"num-traits",
|
||||||
"rand 0.8.5",
|
"rand 0.8.5",
|
||||||
"rand_chacha 0.3.1",
|
"rand_chacha 0.3.1",
|
||||||
|
@ -5151,7 +5151,6 @@ name = "solana-merkle-tree"
|
||||||
version = "1.17.0"
|
version = "1.17.0"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"fast-math",
|
"fast-math",
|
||||||
"matches",
|
|
||||||
"solana-program",
|
"solana-program",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
|
|
@ -41,7 +41,7 @@ thiserror = { workspace = true }
|
||||||
tokio = { workspace = true }
|
tokio = { workspace = true }
|
||||||
|
|
||||||
[dev-dependencies]
|
[dev-dependencies]
|
||||||
matches = { workspace = true }
|
assert_matches = { workspace = true }
|
||||||
solana-logger = { workspace = true }
|
solana-logger = { workspace = true }
|
||||||
|
|
||||||
[[bench]]
|
[[bench]]
|
||||||
|
|
|
@ -14,4 +14,4 @@ extern crate solana_metrics;
|
||||||
|
|
||||||
#[cfg(test)]
|
#[cfg(test)]
|
||||||
#[macro_use]
|
#[macro_use]
|
||||||
extern crate matches;
|
extern crate assert_matches;
|
||||||
|
|
Loading…
Reference in New Issue