chore!: bump rust to 1.85.0 and edition to 2024 (#1630)

Closes: #1629

# Breaking Changes

- bumped `rust` version to `1.85.0`  and edition to `2024`

Author: hal3e

.github/workflows/ci.yml

@@ -19,7 +19,7 @@ env:
   FUEL_CORE_VERSION: 0.41.7
   FUEL_CORE_PATCH_BRANCH: ""
   FUEL_CORE_PATCH_REVISION: ""
-  RUST_VERSION: 1.81.0
+  RUST_VERSION: 1.85.0
   FORC_VERSION: 0.67.0
   FORC_PATCH_BRANCH: ""
   FORC_PATCH_REVISION: ""

Cargo.toml

@@ -33,12 +33,12 @@ members = [
 
 [workspace.package]
 authors = ["Fuel Labs <[email protected]>"]
-edition = "2021"
+edition = "2024"
 homepage = "https://fuel.network/"
 readme = "README.md"
 license = "Apache-2.0"
 repository = "https://github.com/FuelLabs/fuels-rs"
-rust-version = "1.81.0"
+rust-version = "1.85.0"
 version = "0.71.0"
 
 [workspace.dependencies]

e2e/src/aws_kms.rs

@@ -1,12 +1,12 @@
 use fuels::{
     accounts::signers::kms::aws::{
-        aws_config::{defaults, BehaviorVersion, Region},
+        AwsKmsSigner,
+        aws_config::{BehaviorVersion, Region, defaults},
         aws_sdk_kms::{
+            Client,
             config::Credentials,
             types::{KeySpec, KeyUsageType},
-            Client,
         },
-        AwsKmsSigner,
     },
     prelude::Error,
     types::errors::{Context, Result},

e2e/src/e2e_helpers.rs

@@ -1,6 +1,7 @@
-use crate::aws_kms::{AwsKms, AwsKmsProcess};
 use fuels::types::errors::Result;
 
+use crate::aws_kms::{AwsKms, AwsKmsProcess};
+
 pub async fn start_aws_kms(logs: bool) -> Result<AwsKmsProcess> {
     AwsKms::default().with_show_logs(logs).start().await
 }

e2e/tests/aws.rs

@@ -3,10 +3,10 @@ mod tests {
     use anyhow::Result;
     use e2e::e2e_helpers::start_aws_kms;
     use fuels::{
-        accounts::{signers::kms::aws::AwsKmsSigner, wallet::Wallet, Account, ViewOnlyAccount},
+        accounts::{Account, ViewOnlyAccount, signers::kms::aws::AwsKmsSigner, wallet::Wallet},
         core::traits::Signer,
         prelude::{
-            launch_provider_and_get_wallet, AssetId, Contract, LoadConfiguration, TxPolicies,
+            AssetId, Contract, LoadConfiguration, TxPolicies, launch_provider_and_get_wallet,
         },
         types::errors::Context,
     };

e2e/tests/binary_format.rs

@@ -1,8 +1,8 @@
 #[cfg(test)]
 mod tests {
+    use std::{convert::TryInto, ops::Range};
+
     use fuels::programs::executable::{Executable, Regular};
-    use std::convert::TryInto;
-    use std::ops::Range;
 
     const DATA_OFFSET_LOCATION: Range<usize> = 8..16;
     const CONFIGURABLES_OFFSET_LOCATION: Range<usize> = 16..24;

e2e/tests/configurables.rs

@@ -322,8 +322,10 @@ async fn configurable_encoder_config_is_applied() {
             .with_STRUCT(new_struct)
             .expect_err("should error");
 
-        assert!(configurables_error
-            .to_string()
-            .contains("token limit `1` reached while encoding. Try increasing it"),)
+        assert!(
+            configurables_error
+                .to_string()
+                .contains("token limit `1` reached while encoding. Try increasing it"),
+        )
     }
 }

e2e/tests/contracts.rs

@@ -1,16 +1,16 @@
 use std::time::Duration;
 
 use fuel_tx::{
-    consensus_parameters::{ConsensusParametersV1, FeeParametersV1},
     ConsensusParameters, FeeParameters, Output,
+    consensus_parameters::{ConsensusParametersV1, FeeParametersV1},
 };
 use fuels::{
     accounts::signers::private_key::PrivateKeySigner,
-    core::codec::{calldata, encode_fn_selector, DecoderConfig, EncoderConfig},
+    core::codec::{DecoderConfig, EncoderConfig, calldata, encode_fn_selector},
     prelude::*,
     programs::DEFAULT_MAX_FEE_ESTIMATION_TOLERANCE,
     tx::ContractParameters,
-    types::{errors::transaction::Reason, input::Input, Bits256, Identity},
+    types::{Bits256, Identity, errors::transaction::Reason, input::Input},
 };
 use rand::thread_rng;
 use tokio::time::Instant;
@@ -699,8 +699,8 @@ async fn test_connect_wallet() -> Result<()> {
     Ok(())
 }
 
-async fn setup_output_variable_estimation_test(
-) -> Result<(Vec<Wallet>, [Identity; 3], AssetId, Bech32ContractId)> {
+async fn setup_output_variable_estimation_test()
+-> Result<(Vec<Wallet>, [Identity; 3], AssetId, Bech32ContractId)> {
     let wallet_config = WalletsConfig::new(Some(3), None, None);
     let wallets = launch_custom_provider_and_get_wallets(wallet_config, None, None).await?;
 
@@ -1353,7 +1353,7 @@ fn db_rocksdb() {
     use fuels::{
         accounts::wallet::Wallet,
         client::{PageDirection, PaginationRequest},
-        prelude::{setup_test_provider, DbType, Error, ViewOnlyAccount, DEFAULT_COIN_AMOUNT},
+        prelude::{DEFAULT_COIN_AMOUNT, DbType, Error, ViewOnlyAccount, setup_test_provider},
     };
 
     let temp_dir = tempfile::tempdir().expect("failed to make tempdir");
@@ -2237,9 +2237,9 @@ async fn blob_contract_deployment() -> Result<()> {
         .len();
 
     assert!(
-         contract_size > 150_000,
-         "the testnet size limit was around 100kB, we want a contract bigger than that to reflect prod (current: {contract_size}B)"
-     );
+        contract_size > 150_000,
+        "the testnet size limit was around 100kB, we want a contract bigger than that to reflect prod (current: {contract_size}B)"
+    );
 
     let wallets =
         launch_custom_provider_and_get_wallets(WalletsConfig::new(Some(2), None, None), None, None)
@@ -2251,9 +2251,9 @@ async fn blob_contract_deployment() -> Result<()> {
 
     let contract_max_size = consensus_parameters.contract_params().contract_max_size();
     assert!(
-         contract_size > contract_max_size,
-         "this test should ideally be run with a contract bigger than the max contract size ({contract_max_size}B) so that we know deployment couldn't have happened without blobs"
-     );
+        contract_size > contract_max_size,
+        "this test should ideally be run with a contract bigger than the max contract size ({contract_max_size}B) so that we know deployment couldn't have happened without blobs"
+    );
 
     let contract = Contract::load_from(contract_binary, LoadConfiguration::default())?;
 

e2e/tests/debug_utils.rs

@@ -230,7 +230,13 @@ async fn can_debug_multi_call_tx() -> Result<()> {
 
         assert_eq!(
             decoder.decode_fn_args(&fn_selector, call_description.encoded_args.as_slice())?,
-            vec![ "AllStruct { some_struct: SomeStruct { field: 2, field_2: true } }".to_string(), format!("MemoryAddress {{ contract_id: std::contract_id::ContractId {{ bits: Bits256({:?}) }}, function_selector: 123, function_data: 456 }}", contract_id.as_slice())]
+            vec![
+                "AllStruct { some_struct: SomeStruct { field: 2, field_2: true } }".to_string(),
+                format!(
+                    "MemoryAddress {{ contract_id: std::contract_id::ContractId {{ bits: Bits256({:?}) }}, function_selector: 123, function_data: 456 }}",
+                    contract_id.as_slice()
+                )
+            ]
         );
     }
 
@@ -303,8 +309,17 @@ async fn can_debug_multi_call_tx() -> Result<()> {
         assert_eq!(call_description.gas_forwarded, Some(25));
 
         assert_eq!(
-            decoder.decode_fn_args(&call_description.decode_fn_selector().unwrap(), call_description.encoded_args.as_slice())?,
-            vec![ "AllStruct { some_struct: SomeStruct { field: 2, field_2: true } }".to_string(), format!("MemoryAddress {{ contract_id: std::contract_id::ContractId {{ bits: Bits256({:?}) }}, function_selector: 123, function_data: 456 }}", contract_id.as_slice())]
+            decoder.decode_fn_args(
+                &call_description.decode_fn_selector().unwrap(),
+                call_description.encoded_args.as_slice()
+            )?,
+            vec![
+                "AllStruct { some_struct: SomeStruct { field: 2, field_2: true } }".to_string(),
+                format!(
+                    "MemoryAddress {{ contract_id: std::contract_id::ContractId {{ bits: Bits256({:?}) }}, function_selector: 123, function_data: 456 }}",
+                    contract_id.as_slice()
+                )
+            ]
         );
     }
 

e2e/tests/logs.rs

@@ -1,7 +1,7 @@
 use fuels::{
     core::codec::DecoderConfig,
     prelude::*,
-    types::{errors::transaction::Reason, AsciiString, Bits256, SizedAsciiString},
+    types::{AsciiString, Bits256, SizedAsciiString, errors::transaction::Reason},
 };
 
 #[tokio::test]
@@ -1634,7 +1634,10 @@ async fn can_configure_decoder_for_contract_log_decoding() -> Result<()> {
         );
 
         let logs = response.decode_logs();
-        assert!(!logs.filter_failed().is_empty(), "Should have had failed to decode logs since there are more tokens than what is supported by default");
+        assert!(
+            !logs.filter_failed().is_empty(),
+            "Should have had failed to decode logs since there are more tokens than what is supported by default"
+        );
     }
     {
         // Single call: increasing limits makes the test pass
@@ -1669,7 +1672,10 @@ async fn can_configure_decoder_for_contract_log_decoding() -> Result<()> {
         );
 
         let logs = response.decode_logs();
-        assert!(!logs.filter_failed().is_empty(), "should have had failed to decode logs since there are more tokens than what is supported by default");
+        assert!(
+            !logs.filter_failed().is_empty(),
+            "should have had failed to decode logs since there are more tokens than what is supported by default"
+        );
     }
     {
         // Multi call: increasing limits makes the test pass