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

fix: make compatible with edition2018 #1522

Merged
merged 1 commit into from
Jul 27, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
10 changes: 5 additions & 5 deletions ethers-core/src/types/serde_helpers.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,10 @@
use crate::types::{BlockNumber, U256};
use ethabi::ethereum_types::FromDecStrErr;
use serde::{Deserialize, Deserializer};
use std::convert::TryFrom;

/// Helper type to parse both `u64` and `U256`
#[derive(Deserialize)]
#[derive(Copy, Clone, Deserialize)]
#[serde(untagged)]
pub enum Numeric {
U256(U256),
Expand Down Expand Up @@ -85,7 +86,7 @@ where
D: Deserializer<'de>,
{
let num = match NumericSeq::deserialize(deserializer)? {
NumericSeq::Seq(seq) => seq.into_iter().next().unwrap().into(),
NumericSeq::Seq(seq) => seq[0].into(),
NumericSeq::U256(n) => n,
NumericSeq::Num(n) => U256::from(n),
};
Expand All @@ -94,7 +95,7 @@ where
}

/// Various block number representations, See [`lenient_block_number()`]
#[derive(Deserialize)]
#[derive(Clone, Copy, Deserialize)]
#[serde(untagged)]
pub enum LenientBlockNumber {
BlockNumber(BlockNumber),
Expand Down Expand Up @@ -141,7 +142,6 @@ pub fn lenient_block_number_seq<'de, D>(deserializer: D) -> Result<BlockNumber,
where
D: Deserializer<'de>,
{
let num =
<[LenientBlockNumber; 1]>::deserialize(deserializer)?.into_iter().next().unwrap().into();
let num = <[LenientBlockNumber; 1]>::deserialize(deserializer)?[0].into();
Ok(num)
}
6 changes: 5 additions & 1 deletion ethers-core/src/types/transaction/eip712.rs
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,11 @@ use core::convert::TryFrom;
use ethabi::encode;
use proc_macro2::TokenStream;
use serde::{Deserialize, Deserializer, Serialize};
use std::collections::{BTreeMap, HashSet};
use std::{
collections::{BTreeMap, HashSet},
convert::TryInto,
iter::FromIterator,
};
use syn::{
parse::Error, spanned::Spanned as _, AttrStyle, Data, DeriveInput, Expr, Fields,
GenericArgument, Lit, NestedMeta, PathArguments, Type,
Expand Down