update to rust 1.59 (#188)

FuelLabs · Feb 25, 2022 · 034f90f · 034f90f
1 parent e476a89
commit 034f90f
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 13 deletions.
diff --git a/deployment/Dockerfile b/deployment/Dockerfile
@@ -1,5 +1,5 @@
 # Stage 1: Build
-FROM rust:1.58.1 as builder
+FROM rust:1.59.0 as builder
 
 ENV CARGO_NET_GIT_FETCH_WITH_CLI=true
 

diff --git a/fuel-client/tests/tx.rs b/fuel-client/tests/tx.rs
@@ -25,8 +25,7 @@ fn basic_script_snapshot() {
     ];
     let script: Vec<u8> = script
         .iter()
-        .map(|op| u32::from(*op).to_be_bytes())
-        .flatten()
+        .flat_map(|op| u32::from(*op).to_be_bytes())
         .collect();
     insta::assert_snapshot!(format!("{:?}", script));
 }
@@ -49,8 +48,7 @@ async fn dry_run() {
     ];
     let script: Vec<u8> = script
         .iter()
-        .map(|op| u32::from(*op).to_be_bytes())
-        .flatten()
+        .flat_map(|op| u32::from(*op).to_be_bytes())
         .collect();
 
     let tx = fuel_tx::Transaction::script(
@@ -97,8 +95,7 @@ async fn submit() {
     ];
     let script: Vec<u8> = script
         .iter()
-        .map(|op| u32::from(*op).to_be_bytes())
-        .flatten()
+        .flat_map(|op| u32::from(*op).to_be_bytes())
         .collect();
 
     let tx = fuel_tx::Transaction::script(

diff --git a/fuel-core/src/executor.rs b/fuel-core/src/executor.rs
@@ -259,17 +259,16 @@ impl Executor {
                 ..
             } = input
             {
-                let block_created;
-                if self.config.utxo_validation {
-                    block_created = Storage::<UtxoId, Coin>::get(db, utxo_id)?
+                let block_created = if self.config.utxo_validation {
+                    Storage::<UtxoId, Coin>::get(db, utxo_id)?
                         .ok_or(Error::TransactionValidity(
                             TransactionValidityError::CoinDoesntExist,
                         ))?
-                        .block_created;
+                        .block_created
                 } else {
                     // if utxo validation is disabled, just assign this new input to the original block
-                    block_created = Default::default();
-                }
+                    Default::default()
+                };
 
                 Storage::<UtxoId, Coin>::insert(
                     db,

diff --git a/fuel-core/src/schema/tx/types.rs b/fuel-core/src/schema/tx/types.rs
@@ -496,6 +496,7 @@ impl Transaction {
         Ok(status.map(Into::into))
     }
 
+    #[allow(clippy::unnecessary_to_owned)]
     async fn receipts(
         &self,
         ctx: &Context<'_>,