Upgrade to Rust v1.49.0 (bp #14810) (#14811)

* Upgrade to Rust v1.49.0

(cherry picked from commit cbffab7850)

# Conflicts:
#	core/src/crds_value.rs

* rebase

Co-authored-by: Michael Vines <mvines@gmail.com>
This commit is contained in:
mergify[bot]
2021-01-24 04:42:09 +00:00
committed by GitHub
parent b48dd58fda
commit c9da25836a
35 changed files with 155 additions and 131 deletions

View File

@@ -768,11 +768,11 @@ impl TryFrom<tx_by_addr::TransactionByAddr> for Vec<TransactionByAddrInfo> {
type Error = &'static str;
fn try_from(collection: tx_by_addr::TransactionByAddr) -> Result<Self, Self::Error> {
Ok(collection
collection
.tx_by_addrs
.into_iter()
.map(|tx_by_addr| tx_by_addr.try_into())
.collect::<Result<Vec<TransactionByAddrInfo>, Self::Error>>()?)
.collect::<Result<Vec<TransactionByAddrInfo>, Self::Error>>()
}
}