chore: Upgrade to Rust edition 2024 (#2125)

* contract-build: Update new project and metadata templates to 2024 edition

* manifests: Update edition to 2024

* rustfmt: Update edition to 2024

* manifest: Update rust-version to 1.88

* contract-build: unsafe `env::set_var`

* transcode: unsafe extern

* tests: unsafe `env::set_var`

* Update changelog

* chore: clippy fix

* chore: fmt

* Update `Cargo.lock`

Author: davidsemakula

.rustfmt.toml

@@ -43,8 +43,8 @@ trailing_comma = "Vertical"
 match_block_trailing_comma = false
 blank_lines_upper_bound = 1
 blank_lines_lower_bound = 0
-edition = "2021" # changed
-version = "One"
+edition = "2024" # changed
+style_edition = "2024"
 merge_derives = true
 use_try_shorthand = true # changed
 use_field_init_shorthand = true # changed
@@ -54,7 +54,7 @@ color = "Auto"
 unstable_features = true # changed
 disable_all_formatting = false
 skip_children = false
-hide_parse_errors = false
+show_parse_errors = true
 error_on_line_overflow = false
 error_on_unformatted = false
 ignore = []

CHANGELOG.md

@@ -10,6 +10,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Upgrade to `subxt` `0.44` ‒ [2127](https://github.com/use-ink/cargo-contract/pull/2127)
 - Synchronized with `polkadot-sdk/c40b36c3a7c208f9a6837b80812473af3d9ba7f7` ‒ [2102](https://github.com/use-ink/cargo-contract/pull/2102)
 - Re-enable `rustc` overflow checks - [#2116](https://github.com/use-ink/cargo-contract/pull/2116)
+- chore: Upgrade to Rust edition 2024 - [#2125](https://github.com/use-ink/cargo-contract/pull/2125)
 
 ### Removed
 - Removed chain extension functionality ‒ [2120](https://github.com/use-ink/cargo-contract/pull/2120)

Cargo.lock

@@ -1,7 +1,10 @@
 [workspace]
-resolver = "2"
+resolver = "3"
 members = ["crates/*"]
 
+[workspace.package]
+rust-version = "1.88"
+
 [workspace.dependencies]
 ink_metadata = { git = "https://github.com/use-ink/ink", branch = "master", version = "6.0.0-alpha.1", default-features = false, features = ["std", "derive"] }
 ink_env = { git = "https://github.com/use-ink/ink", branch = "master", version = "6.0.0-alpha.1", features = ["unstable-hostfn"] }

Cargo.toml

@@ -2,7 +2,7 @@
 name = "contract-analyze"
 version = "6.0.0-alpha.1"
 authors = ["Use Ink <[email protected]>"]
-edition = "2021"
+edition = "2024"
 
 license = "Apache-2.0"
 readme = "README.md"

crates/analyze/Cargo.toml

@@ -17,8 +17,8 @@
 #![deny(unused_crate_dependencies)]
 
 use anyhow::{
-    bail,
     Result,
+    bail,
 };
 pub use contract_metadata::Language;
 

crates/analyze/src/lib.rs

@@ -2,7 +2,7 @@
 name = "contract-build"
 version = "6.0.0-alpha.1"
 authors = ["Use Ink <[email protected]>"]
-edition = "2021"
+edition = "2024"
 
 license = "Apache-2.0"
 readme = "README.md"

crates/build/Cargo.toml

@@ -19,8 +19,8 @@ use std::{
     ffi::OsStr,
     fs::File,
     io::{
-        prelude::*,
         Write,
+        prelude::*,
     },
     iter::Iterator,
     path::{
@@ -32,9 +32,9 @@ use std::{
 use anyhow::Result;
 use walkdir::WalkDir;
 use zip::{
-    write::FileOptions,
     CompressionMethod,
     ZipWriter,
+    write::FileOptions,
 };
 
 const DEFAULT_UNIX_PERMISSIONS: u32 = 0o755;

crates/build/build.rs

@@ -312,10 +312,10 @@ mod tests {
         package_abi,
     };
     use crate::{
-        new_contract_project,
-        util::tests::with_tmp_dir,
         Abi,
         ManifestPath,
+        new_contract_project,
+        util::tests::with_tmp_dir,
     };
 
     #[test]

crates/build/src/crate_metadata.rs

@@ -35,8 +35,8 @@
 use std::{
     cmp::Ordering,
     collections::{
-        hash_map::DefaultHasher,
         HashMap,
+        hash_map::DefaultHasher,
     },
     hash::{
         Hash,
@@ -55,6 +55,7 @@ use anyhow::{
     Result,
 };
 use bollard::{
+    Docker,
     container::{
         AttachContainerOptions,
         AttachContainerResults,
@@ -76,7 +77,6 @@ use bollard::{
         Mount,
         MountTypeEnum,
     },
-    Docker,
 };
 use contract_metadata::ContractMetadata;
 use tokio_stream::{
@@ -85,11 +85,11 @@ use tokio_stream::{
 };
 
 use crate::{
-    verbose_eprintln,
     BuildResult,
     CrateMetadata,
     ExecuteArgs,
     Verbosity,
+    verbose_eprintln,
 };
 
 use colored::Colorize;