Switch to rust edition 2024 (#885)

* Naive test with just updating the version without any changes.

* Mark extern and no_mangle as unsafe

* Apply new formatting rules

* Remove redundant parenthesis

* Simplify if

* Simplify if-structure

* Use new syntax "use bound" syntax for generics

* Use `match` instead of `if let`

* Use `expr_2021` in macros

Author: Niederb

api-client/Cargo.toml

@@ -3,7 +3,7 @@ name = "substrate-api-client"
 version = "1.22.0"
 authors = ["Supercomputing Systems AG <info@scs.ch>"]
 license = "Apache-2.0"
-edition = "2021"
+edition = "2024"
 repository = "https://github.com/scs/substrate-api-client"
 description = "Json-rpc client with helper functions compatible with any Substrate node"
 readme = "../README.md"

api-client/src/api/api_client.rs

@@ -12,10 +12,10 @@
 */
 
 use crate::{
+	GetAccountInformation,
 	api::error::{Error, Result},
 	rpc::Request,
 	runtime_api::RuntimeApiClient,
-	GetAccountInformation,
 };
 use ac_compose_macros::rpc_params;
 use ac_node_api::metadata::Metadata;
@@ -272,7 +272,7 @@ mod tests {
 	use ac_primitives::{
 		DefaultRuntimeConfig, GenericAdditionalParams, GenericExtrinsicParams, PlainTip,
 	};
-	use frame_metadata::{v14::ExtrinsicMetadata, RuntimeMetadata};
+	use frame_metadata::{RuntimeMetadata, v14::ExtrinsicMetadata};
 	use scale_info::form::PortableForm;
 	use sp_core::H256;
 	use std::{collections::HashMap, fs};

api-client/src/api/error.rs

@@ -15,7 +15,7 @@
 
 */
 
-use crate::{api::UnexpectedTxStatus, rpc::Error as RpcClientError, ExtrinsicReport};
+use crate::{ExtrinsicReport, api::UnexpectedTxStatus, rpc::Error as RpcClientError};
 use ac_node_api::{
 	error::DispatchError,
 	metadata::{MetadataConversionError, MetadataError},

api-client/src/api/mod.rs

@@ -16,7 +16,7 @@
 */
 
 use crate::error::FailedExtrinsicError;
-use ac_node_api::{events::RawEventDetails, EventDetails, Metadata};
+use ac_node_api::{EventDetails, Metadata, events::RawEventDetails};
 use alloc::{string::String, vec::Vec};
 use codec::{Decode, Encode};
 use serde::{Deserialize, Serialize};

api-client/src/api/rpc_api/author.rs

@@ -14,12 +14,12 @@
 //! Interface to common author rpc functions and helpers thereof.
 
 use crate::{
-	api::{rpc_api::events::FetchEvents, Error, Result},
-	rpc::{HandleSubscription, Request, Subscribe},
 	Api, ExtrinsicReport, TransactionStatus, XtStatus,
+	api::{Error, Result, rpc_api::events::FetchEvents},
+	rpc::{HandleSubscription, Request, Subscribe},
 };
 use ac_compose_macros::rpc_params;
-use ac_primitives::{config::Config, UncheckedExtrinsic};
+use ac_primitives::{UncheckedExtrinsic, config::Config};
 #[cfg(all(not(feature = "sync-api"), not(feature = "std")))]
 use alloc::boxed::Box;
 use codec::{Decode, Encode};

api-client/src/api/rpc_api/chain.rs

@@ -12,9 +12,9 @@
 */
 
 use crate::{
+	Error,
 	api::{Api, Result},
 	rpc::{Request, Subscribe},
-	Error,
 };
 use ac_compose_macros::rpc_params;
 use ac_primitives::config::Config;
@@ -37,7 +37,7 @@ pub trait GetChainInfo {
 	async fn get_header(&self, hash: Option<Self::Hash>) -> Result<Option<Self::Header>>;
 
 	async fn get_block_hash(&self, number: Option<Self::BlockNumber>)
-		-> Result<Option<Self::Hash>>;
+	-> Result<Option<Self::Hash>>;
 
 	/// Returns the genesis block
 	async fn get_genesis_block(&self) -> Result<Self::Block>;

api-client/src/api/rpc_api/events.rs

@@ -12,12 +12,12 @@
 */
 
 use crate::{
+	GetChainInfo, GetStorage,
 	api::{Api, Error, Result},
 	rpc::{HandleSubscription, Request, Subscribe},
-	GetChainInfo, GetStorage,
 };
 use ac_compose_macros::rpc_params;
-use ac_node_api::{metadata::Metadata, EventDetails, EventRecord, Events, Phase};
+use ac_node_api::{EventDetails, EventRecord, Events, Phase, metadata::Metadata};
 use ac_primitives::config::Config;
 #[cfg(all(not(feature = "sync-api"), not(feature = "std")))]
 use alloc::boxed::Box;
@@ -238,10 +238,10 @@ mod tests {
 	use frame_metadata::RuntimeMetadataPrefixed;
 	use rococo_runtime::{BalancesCall, RuntimeCall, UncheckedExtrinsic};
 	use scale_info::TypeInfo;
-	use sp_core::{crypto::Ss58Codec, sr25519, Bytes, H256};
+	use sp_core::{Bytes, H256, crypto::Ss58Codec, sr25519};
 	use sp_runtime::{
-		generic::{Block, SignedBlock},
 		AccountId32, MultiAddress,
+		generic::{Block, SignedBlock},
 	};
 	use sp_storage::StorageData;
 	use sp_version::RuntimeVersion;

api-client/src/api/rpc_api/frame_system.rs

@@ -18,7 +18,7 @@ use crate::{
 	rpc::Request,
 };
 use ac_compose_macros::rpc_params;
-use ac_primitives::{config::Config, AccountInfo};
+use ac_primitives::{AccountInfo, config::Config};
 #[cfg(all(not(feature = "sync-api"), not(feature = "std")))]
 use alloc::boxed::Box;
 use alloc::{string::String, vec::Vec};

api-client/src/api/rpc_api/pallet_transaction_payment.rs

@@ -15,7 +15,7 @@ use crate::{
 	rpc::Request,
 };
 use ac_compose_macros::rpc_params;
-use ac_primitives::{config::Config, FeeDetails, InclusionFee, NumberOrHex, RuntimeDispatchInfo};
+use ac_primitives::{FeeDetails, InclusionFee, NumberOrHex, RuntimeDispatchInfo, config::Config};
 #[cfg(all(not(feature = "sync-api"), not(feature = "std")))]
 use alloc::boxed::Box;
 use core::str::FromStr;

api-client/src/api/rpc_api/runtime_update.rs

@@ -10,7 +10,7 @@
 	See the License for the specific language governing permissions and
 	limitations under the License.
 */
-use crate::{api::Error, rpc::Subscribe, rpc_api::EventSubscriptionFor, Result};
+use crate::{Result, api::Error, rpc::Subscribe, rpc_api::EventSubscriptionFor};
 use alloc::sync::Arc;
 use codec::{Decode, Encode};
 use core::sync::atomic::{AtomicBool, Ordering};
@@ -49,10 +49,10 @@ where
 	#[maybe_async::maybe_async(?Send)]
 	pub async fn detect_runtime_update(&mut self) -> Result<bool> {
 		'outer: loop {
-			if let Some(canceled) = &self.external_cancellation {
-				if canceled.load(Ordering::SeqCst) {
-					return Ok(false)
-				}
+			if let Some(canceled) = &self.external_cancellation
+				&& canceled.load(Ordering::SeqCst)
+			{
+				return Ok(false)
 			}
 			let event_records = self
 				.subscription