diff --git a/Cargo.lock b/Cargo.lock index 6ab3f97dfd0..4ea1f80532a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3255,7 +3255,6 @@ dependencies = [ "dialoguer", "digest 0.10.7", "directories", - "displaydoc", "educe", "enumflags2", "ethereum-types", diff --git a/Cargo.toml b/Cargo.toml index 5da114f1b2a..be0d6f95288 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -62,7 +62,6 @@ derive_more = { version = "2", features = ["from", "into"] } dialoguer = "0.12" digest = "0.10" directories = "6" -displaydoc = "0.2" educe = { version = "0.6", features = ["Debug"], default-features = false } enumflags2 = "0.7" ethereum-types = { version = "0.16", features = ["ethbloom"] } diff --git a/src/networks/mod.rs b/src/networks/mod.rs index 9c1a25f9f95..84194ad43d7 100644 --- a/src/networks/mod.rs +++ b/src/networks/mod.rs @@ -60,20 +60,16 @@ static INITIAL_FIL_RESERVED: LazyLock = /// Forest builtin `filecoin` network chains. In general only `mainnet` and its /// chain information should be considered stable. #[derive( - Debug, Clone, PartialEq, Eq, Serialize, Deserialize, Default, Hash, displaydoc::Display, + Debug, Clone, PartialEq, Eq, Serialize, Deserialize, Default, Hash, derive_more::Display, )] #[cfg_attr(test, derive(derive_quickcheck_arbitrary::Arbitrary))] #[serde(tag = "type", content = "name", rename_all = "lowercase")] +#[display(rename_all = "lowercase")] pub enum NetworkChain { - /// mainnet #[default] Mainnet, - /// calibnet Calibnet, - /// butterflynet Butterflynet, - /// devnet - #[displaydoc("{0}")] Devnet(String), } diff --git a/src/rpc/methods/eth/types.rs b/src/rpc/methods/eth/types.rs index 336bb48a50b..4db4e44fc96 100644 --- a/src/rpc/methods/eth/types.rs +++ b/src/rpc/methods/eth/types.rs @@ -386,12 +386,12 @@ impl TryFrom for Message { Default, Clone, JsonSchema, - displaydoc::Display, + derive_more::Display, derive_more::From, derive_more::Into, derive_more::FromStr, )] -#[displaydoc("{0:#x}")] +#[display("{_0:#x}")] pub struct EthHash(#[schemars(with = "String")] pub ethereum_types::H256); lotus_json_with_self!(EthHash); diff --git a/src/rpc/reflect/mod.rs b/src/rpc/reflect/mod.rs index 8711c6e6729..2388b3324bf 100644 --- a/src/rpc/reflect/mod.rs +++ b/src/rpc/reflect/mod.rs @@ -95,7 +95,7 @@ pub trait RpcMethod { PartialOrd, Ord, Hash, - displaydoc::Display, + derive_more::Display, Serialize, Deserialize, )] diff --git a/src/shim/address.rs b/src/shim/address.rs index b5a53318cfe..503fb5abcc3 100644 --- a/src/shim/address.rs +++ b/src/shim/address.rs @@ -285,12 +285,11 @@ impl GetSize for Address { Ord, Serialize, Deserialize, - displaydoc::Display, + derive_more::Display, derive_more::From, derive_more::Into, )] #[serde(transparent)] -#[displaydoc("{0}")] pub struct StrictAddress(pub Address); impl FromStr for StrictAddress {