Upgrade to Rust v1.49.0

2021-01-23 11:55:15 -08:00
parent 7604edb16f
commit cbffab7850
36 changed files with 156 additions and 132 deletions
--- a/storage-proto/src/convert.rs
+++ b/storage-proto/src/convert.rs
@ -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>>()
    }
 }