LumeWeb
/
ethers-rs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

style: remove token instead cloning them (#236)

This commit is contained in:
Matthias Seitz 2021-03-18 06:31:49 +01:00 committed by GitHub
parent 05d2aa8579
commit c525c71d96
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ethers-contract/src/multicall/mod.rs
View File

@ -307,11 +307,11 @@ impl<M: Middleware> Multicall<M> {
.iter() .iter()
.zip(&return_data) .zip(&return_data)
.map(|(call, bytes)| { .map(|(call, bytes)| {
let tokens: Vec<Token> = call.function.decode_output(&bytes)?; let mut tokens: Vec<Token> = call.function.decode_output(&bytes)?;
Ok(match tokens.len() { Ok(match tokens.len() {
0 => Token::Tuple(vec![]), 0 => Token::Tuple(vec![]),
1 => tokens[0].clone(), 1 => tokens.remove(0),
_ => Token::Tuple(tokens), _ => Token::Tuple(tokens),
}) })
}) })

8
ethers-core/src/abi/tokens.rs
View File

@ -31,10 +31,10 @@ impl Detokenize for () {
} }
impl<T: Tokenizable> Detokenize for T { impl<T: Tokenizable> Detokenize for T {
fn from_tokens(tokens: Vec<Token>) -> Result<Self, InvalidOutputType> { fn from_tokens(mut tokens: Vec<Token>) -> Result<Self, InvalidOutputType> {
let token = match tokens.len() { let token = match tokens.len() {
0 => Token::Tuple(vec![]), 0 => Token::Tuple(vec![]),
1 => tokens[0].clone(), 1 => tokens.remove(0),
_ => Token::Tuple(tokens), _ => Token::Tuple(tokens),
}; };
@ -473,11 +473,11 @@ impl_fixed_types!(1024);
/// Helper for flattening non-nested tokens into their inner /// Helper for flattening non-nested tokens into their inner
/// types, e.g. (A, B, C ) would get tokenized to Tuple([A, B, C]) /// types, e.g. (A, B, C ) would get tokenized to Tuple([A, B, C])
/// when in fact we need [A, B, C]. /// when in fact we need [A, B, C].
fn flatten_tokens(tokens: Vec<Token>) -> Vec<Token> { fn flatten_tokens(mut tokens: Vec<Token>) -> Vec<Token> {
if tokens.len() == 1 { if tokens.len() == 1 {
// flatten the tokens if required // flatten the tokens if required
// and there is no nesting // and there is no nesting
match tokens[0].clone() { match tokens.remove(0) {
Token::Tuple(inner) => inner, Token::Tuple(inner) => inner,
other => vec![other], other => vec![other],
} }