Skip to content
This repository has been archived by the owner on Oct 19, 2024. It is now read-only.

Update strum #2724

Merged
merged 2 commits into from
Feb 12, 2024
Merged

Update strum #2724

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5c898e2
Update strum
richardpringle Feb 1, 2024
1371585
chore: fmt
DaniPopes Feb 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,6 @@ ethers-contract-derive = { version = "2.0.13", path = "ethers-contract/ethers-co
# async / async utils
tokio = "1.32"
tokio-tungstenite = { version = "0.20", default-features = false }
futures = { version = "0.3.28", default-features = false, features = ["std"] }
futures-core = "0.3.28"
futures-util = "0.3.28"
futures-executor = "0.3.28"
Expand Down
2 changes: 1 addition & 1 deletion ethers-core/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ bytes = { workspace = true, features = ["serde"] }
hex.workspace = true
once_cell = { workspace = true, optional = true }
unicode-xid = "0.2"
strum = { version = "0.25", features = ["derive"] }
strum = { version = "0.26.1", features = ["derive"] }
num_enum = "0.7"

# macros feature enabled dependencies
Expand Down
4 changes: 2 additions & 2 deletions ethers-core/src/macros/ethers_crate.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ use std::{
env, fmt, fs,
path::{Path, PathBuf},
};
use strum::{EnumCount, EnumIter, EnumString, EnumVariantNames, IntoEnumIterator};
use strum::{EnumCount, EnumIter, EnumString, IntoEnumIterator, VariantNames};

/// `ethers_crate => name`
type CrateNames = HashMap<EthersCrate, &'static str>;
Expand Down Expand Up @@ -211,7 +211,7 @@ impl ProjectEnvironment {
EnumCount,
EnumIter,
EnumString,
EnumVariantNames,
VariantNames,
)]
#[strum(serialize_all = "kebab-case")]
pub enum EthersCrate {
Expand Down
4 changes: 2 additions & 2 deletions ethers-core/src/types/chain.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ use std::{
fmt,
time::Duration,
};
use strum::{AsRefStr, EnumCount, EnumIter, EnumString, EnumVariantNames};
use strum::{AsRefStr, EnumCount, EnumIter, EnumString, VariantNames};

// compatibility re-export
#[doc(hidden)]
Expand Down Expand Up @@ -42,7 +42,7 @@ pub type ParseChainError = TryFromPrimitiveError<Chain>;
Ord,
Hash,
AsRefStr, // AsRef<str>, fmt::Display and serde::Serialize
EnumVariantNames, // Chain::VARIANTS
VariantNames, // Chain::VARIANTS
EnumString, // FromStr, TryFrom<&str>
EnumIter, // Chain::iter
EnumCount, // Chain::COUNT
Expand Down
4 changes: 2 additions & 2 deletions ethers-core/src/types/opcode.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
use num_enum::TryFromPrimitive;
use serde::{Deserialize, Serialize};
use strum::{AsRefStr, Display, EnumCount, EnumIter, EnumString, EnumVariantNames};
use strum::{AsRefStr, Display, EnumCount, EnumIter, EnumString, VariantNames};

// opcode descriptions taken from evm.codes https://github.com/comitylabs/evm.codes/blob/bc7f102808055d88365559d40c190c5bd6d164c3/opcodes.json
// https://github.com/ethereum/go-ethereum/blob/2b1299b1c006077c56ecbad32e79fc16febe3dd6/core/vm/opcodes.go
Expand All @@ -18,7 +18,7 @@ use strum::{AsRefStr, Display, EnumCount, EnumIter, EnumString, EnumVariantNames
AsRefStr,
Display,
EnumString,
EnumVariantNames,
VariantNames,
EnumIter,
EnumCount,
TryFromPrimitive,
Expand Down
Loading