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.
solana-labs · Sep 7, 2023 · 528a03f · 528a03f
1 parent f4816dc
commit 528a03f
Show file tree

Hide file tree

Showing 26 changed files with 27 additions and 40 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -231,7 +231,6 @@ light-poseidon = "0.1.1"
 log = "0.4.20"
 lru = "0.7.7"
 lz4 = "1.24.0"
-matches = "0.1.10"
 memmap2 = "0.5.10"
 memoffset = "0.9"
 merlin = "3"

diff --git a/core/Cargo.toml b/core/Cargo.toml
@@ -76,8 +76,8 @@ tokio = { workspace = true, features = ["full"] }
 trees = { workspace = true }
 
 [dev-dependencies]
+assert_matches = { workspace = true }
 fs_extra = { workspace = true }
-matches = { workspace = true }
 raptorq = { workspace = true }
 serde_json = { workspace = true }
 serial_test = { workspace = true }

diff --git a/core/src/lib.rs b/core/src/lib.rs
@@ -69,4 +69,4 @@ extern crate solana_frozen_abi_macro;
 
 #[cfg(test)]
 #[macro_use]
-extern crate matches;
+extern crate assert_matches;
diff --git a/entry/Cargo.toml b/entry/Cargo.toml
@@ -26,7 +26,7 @@ solana-rayon-threadlimit = { workspace = true }
 solana-sdk = { workspace = true }
 
 [dev-dependencies]
-matches = { workspace = true }
+assert_matches = { workspace = true }
 solana-logger = { workspace = true }
 
 [lib]

diff --git a/entry/src/poh.rs b/entry/src/poh.rs
@@ -128,7 +128,7 @@ pub fn compute_hashes_per_tick(duration: Duration, hashes_sample_size: u64) -> u
 mod tests {
     use {
         crate::poh::{Poh, PohEntry},
-        matches::assert_matches,
+        assert_matches::assert_matches,
         solana_sdk::hash::{hash, hashv, Hash},
         std::time::Duration,
     };

diff --git a/gossip/Cargo.toml b/gossip/Cargo.toml
@@ -10,6 +10,7 @@ license = { workspace = true }
 edition = { workspace = true }
 
 [dependencies]
+assert_matches = { workspace = true }
 bincode = { workspace = true }
 bv = { workspace = true, features = ["serde"] }
 clap = { workspace = true }
@@ -19,7 +20,6 @@ indexmap = { workspace = true, features = ["rayon"] }
 itertools = { workspace = true }
 log = { workspace = true }
 lru = { workspace = true }
-matches = { workspace = true }
 num-traits = { workspace = true }
 rand = { workspace = true }
 rand_chacha = { workspace = true }

diff --git a/gossip/src/contact_info.rs b/gossip/src/contact_info.rs
@@ -1,6 +1,6 @@
 use {
     crate::crds_value::MAX_WALLCLOCK,
-    matches::{assert_matches, debug_assert_matches},
+    assert_matches::{assert_matches, debug_assert_matches},
     serde::{Deserialize, Deserializer, Serialize},
     solana_sdk::{
         pubkey::Pubkey,

diff --git a/gossip/src/crds.rs b/gossip/src/crds.rs
@@ -32,13 +32,13 @@ use {
         crds_value::{CrdsData, CrdsValue, CrdsValueLabel},
         legacy_contact_info::LegacyContactInfo as ContactInfo,
     },
+    assert_matches::debug_assert_matches,
     bincode::serialize,
     indexmap::{
         map::{rayon::ParValues, Entry, IndexMap},
         set::IndexSet,
     },
     lru::LruCache,
-    matches::debug_assert_matches,
     rayon::{prelude::*, ThreadPool},
     solana_sdk::{
         clock::Slot,

diff --git a/gossip/src/lib.rs b/gossip/src/lib.rs
@@ -31,7 +31,7 @@ extern crate log;
 
 #[cfg(test)]
 #[macro_use]
-extern crate matches;
+extern crate assert_matches;
 
 #[macro_use]
 extern crate serde_derive;

diff --git a/ledger/Cargo.toml b/ledger/Cargo.toml
@@ -75,7 +75,6 @@ features = ["lz4"]
 
 [dev-dependencies]
 bs58 = { workspace = true }
-matches = { workspace = true }
 solana-account-decoder = { workspace = true }
 solana-logger = { workspace = true }
 test-case = { workspace = true }

diff --git a/ledger/src/blockstore_processor.rs b/ledger/src/blockstore_processor.rs
@@ -1859,7 +1859,7 @@ pub mod tests {
                 create_genesis_config, create_genesis_config_with_leader, GenesisConfigInfo,
             },
         },
-        matches::assert_matches,
+        assert_matches::assert_matches,
         rand::{thread_rng, Rng},
         solana_entry::entry::{create_ticks, next_entry, next_entry_mut},
         solana_program_runtime::declare_process_instruction,

diff --git a/ledger/src/shred.rs b/ledger/src/shred.rs
@@ -1031,8 +1031,8 @@ pub fn verify_test_data_shred(
 mod tests {
     use {
         super::*,
+        assert_matches::assert_matches,
         bincode::serialized_size,
-        matches::assert_matches,
         rand::Rng,
         rand_chacha::{rand_core::SeedableRng, ChaChaRng},
         solana_sdk::{shred_version, signature::Signer, signer::keypair::keypair_from_seed},

diff --git a/ledger/src/shred/legacy.rs b/ledger/src/shred/legacy.rs
@@ -330,7 +330,7 @@ mod test {
     use {
         super::*,
         crate::shred::{shred_code::MAX_CODE_SHREDS_PER_SLOT, ShredType, MAX_DATA_SHREDS_PER_SLOT},
-        matches::assert_matches,
+        assert_matches::assert_matches,
     };
 
     #[test]

diff --git a/ledger/src/shred/merkle.rs b/ledger/src/shred/merkle.rs
@@ -1052,8 +1052,8 @@ mod test {
     use {
         super::*,
         crate::shred::{ShredFlags, ShredId, SignedData},
+        assert_matches::assert_matches,
         itertools::Itertools,
-        matches::assert_matches,
         rand::{seq::SliceRandom, CryptoRng, Rng},
         rayon::ThreadPoolBuilder,
         solana_sdk::signature::{Keypair, Signer},

diff --git a/ledger/src/shredder.rs b/ledger/src/shredder.rs
@@ -472,8 +472,8 @@ mod tests {
                 ShredType, MAX_CODE_SHREDS_PER_SLOT,
             },
         },
+        assert_matches::assert_matches,
         bincode::serialized_size,
-        matches::assert_matches,
         rand::{seq::SliceRandom, Rng},
         solana_sdk::{
             hash::{hash, Hash},

diff --git a/ledger/src/sigverify_shreds.rs b/ledger/src/sigverify_shreds.rs
@@ -465,7 +465,7 @@ mod tests {
             shred::{ProcessShredsStats, Shred, ShredFlags, LEGACY_SHRED_DATA_CAPACITY},
             shredder::{ReedSolomonCache, Shredder},
         },
-        matches::assert_matches,
+        assert_matches::assert_matches,
         rand::{seq::SliceRandom, Rng},
         rayon::ThreadPoolBuilder,
         solana_entry::entry::Entry,

diff --git a/merkle-tree/Cargo.toml b/merkle-tree/Cargo.toml
@@ -13,10 +13,6 @@ edition = { workspace = true }
 fast-math = { 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]
 hex = { workspace = true }
 

diff --git a/merkle-tree/src/lib.rs b/merkle-tree/src/lib.rs
@@ -1,8 +1,4 @@
 #![allow(clippy::arithmetic_side_effects)]
 
-#[cfg(target_os = "solana")]
-#[macro_use]
-extern crate matches;
-
 pub mod merkle_tree;
 pub use merkle_tree::MerkleTree;
diff --git a/perf/Cargo.toml b/perf/Cargo.toml
@@ -35,7 +35,7 @@ nix = { workspace = true }
 name = "solana_perf"
 
 [dev-dependencies]
-matches = { workspace = true }
+assert_matches = { workspace = true }
 rand_chacha = { workspace = true }
 solana-logger = { workspace = true }
 test-case = { workspace = true }

diff --git a/perf/src/lib.rs b/perf/src/lib.rs
@@ -18,7 +18,7 @@ extern crate log;
 
 #[cfg(test)]
 #[macro_use]
-extern crate matches;
+extern crate assert_matches;
 
 #[macro_use]
 extern crate solana_metrics;

diff --git a/poh/Cargo.toml b/poh/Cargo.toml
@@ -22,8 +22,8 @@ solana-sdk = { workspace = true }
 thiserror = { workspace = true }
 
 [dev-dependencies]
+assert_matches = { workspace = true }
 bincode = { workspace = true }
-matches = { workspace = true }
 rand = { workspace = true }
 solana-logger = { workspace = true }
 solana-perf = { workspace = true }

diff --git a/poh/src/lib.rs b/poh/src/lib.rs
@@ -8,4 +8,4 @@ extern crate solana_metrics;
 
 #[cfg(test)]
 #[macro_use]
-extern crate matches;
+extern crate assert_matches;
diff --git a/programs/sbf/Cargo.lock b/programs/sbf/Cargo.lock
diff --git a/turbine/Cargo.toml b/turbine/Cargo.toml
@@ -41,7 +41,7 @@ thiserror = { workspace = true }
 tokio = { workspace = true }
 
 [dev-dependencies]
-matches = { workspace = true }
+assert_matches = { workspace = true }
 solana-logger = { workspace = true }
 
 [[bench]]

diff --git a/turbine/src/lib.rs b/turbine/src/lib.rs
@@ -14,4 +14,4 @@ extern crate solana_metrics;
 
 #[cfg(test)]
 #[macro_use]
-extern crate matches;
+extern crate assert_matches;