Update to Rust 2024 edition (#843)

* Update to edition 2024

* Format using new edition rules

* Fix new clippy error

* Update `CHANGELOG.md`

Author: jessebraham

.github/workflows/ci.yml

@@ -11,7 +11,7 @@ on:
 
 env:
   CARGO_TERM_COLOR: always
-  MSRV: "1.82"
+  MSRV: "1.85"
 
 # Cancel any currently running workflows from the same PR, branch, or
 # tag when a new workflow is triggered.

CHANGELOG.md

@@ -40,6 +40,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - `--non-interactive` may now react to key events (user input, Ctrl-C, Ctrl-R) if possible (#819)
 - Removed `get_` prefix from any functions which previously had it (#824)
 - Take elf data as bytes rather than `ElfFile` struct when creating an image format (#825)
+- Updated to Rust 2024 edition (#843)
 
 ### Fixed
 

cargo-espflash/Cargo.toml

@@ -1,8 +1,8 @@
 [package]
 name         = "cargo-espflash"
 version      = "4.0.0-dev"
-edition      = "2021"
-rust-version = "1.82"
+edition      = "2024"
+rust-version = "1.85"
 description  = "Cargo subcommand for interacting with Espressif devices"
 repository   = "https://github.com/esp-rs/espflash"
 license      = "MIT OR Apache-2.0"

cargo-espflash/README.md

@@ -2,7 +2,7 @@
 # cargo-espflash
 
 [![Crates.io](https://img.shields.io/crates/v/cargo-espflash?labelColor=1C2C2E&color=C96329&logo=Rust&style=flat-square)](https://crates.io/crates/cargo-espflash)
-![MSRV](https://img.shields.io/badge/MSRV-1.82-blue?labelColor=1C2C2E&logo=Rust&style=flat-square)
+![MSRV](https://img.shields.io/badge/MSRV-1.85-blue?labelColor=1C2C2E&logo=Rust&style=flat-square)
 ![Crates.io](https://img.shields.io/crates/l/cargo-espflash?labelColor=1C2C2E&style=flat-square)
 
 Cross-compiler and Cargo extension for flashing Espressif devices.
@@ -25,7 +25,7 @@ Supports the **ESP32**, **ESP32-C2/C3/C6**, **ESP32-H2**, **ESP32-P4**, and **ES
 
 ## Installation
 
-If you are installing `cargo-espflash` from source (ie. using `cargo install`) then you must have `rustc>=1.82.0` installed on your system.
+If you are installing `cargo-espflash` from source (ie. using `cargo install`) then you must have `rustc>=1.85.0` installed on your system.
 
 To install:
 

cargo-espflash/src/cargo_config.rs

@@ -89,9 +89,5 @@ fn config_path(path: &Path) -> Option<PathBuf> {
     }
 
     let toml = path.join(".cargo/config.toml");
-    if toml.exists() {
-        Some(toml)
-    } else {
-        None
-    }
+    if toml.exists() { Some(toml) } else { None }
 }

cargo-espflash/src/error.rs

@@ -27,8 +27,10 @@ pub enum Error {
     #[error("No executable artifact found")]
     #[diagnostic(
         code(cargo_espflash::no_artifact),
-        help("If you're trying to run an example you need to specify it using the `--example` argument.\n\
-              If you're in a Cargo workspace, specify the binary package with `--package`.")
+        help(
+            "If you're trying to run an example you need to specify it using the `--example` argument.\n\
+              If you're in a Cargo workspace, specify the binary package with `--package`."
+        )
     )]
     NoArtifact,
 
@@ -46,8 +48,10 @@ pub enum Error {
     #[error("No package could be located in the current workspace")]
     #[diagnostic(
         code(cargo_espflash::no_package),
-        help("Ensure that you are executing from a valid package, and that the specified package name \
-              exists in the current workspace.")
+        help(
+            "Ensure that you are executing from a valid package, and that the specified package name \
+              exists in the current workspace."
+        )
     )]
     NoPackage,
 
@@ -145,7 +149,6 @@ impl Diagnostic for NoTargetError {
                 chip.into_target().supported_build_targets().join(", ")
             ),
             None => "Specify the target in `.cargo/config.toml`".into(),
-        }
-        ))
+        }))
     }
 }

cargo-espflash/src/main.rs

@@ -1,12 +1,13 @@
 use std::{
     fs,
     path::PathBuf,
-    process::{exit, Command, ExitStatus, Stdio},
+    process::{Command, ExitStatus, Stdio, exit},
 };
 
 use cargo_metadata::{Message, MetadataCommand};
 use clap::{Args, CommandFactory, Parser, Subcommand};
 use espflash::{
+    Error as EspflashError,
     cli::{
         self,
         config::Config,
@@ -17,9 +18,8 @@ use espflash::{
     logging::initialize_logger,
     targets::{Chip, XtalFrequency},
     update::check_for_update,
-    Error as EspflashError,
 };
-use log::{debug, info, LevelFilter};
+use log::{LevelFilter, debug, info};
 use miette::{IntoDiagnostic, Result, WrapErr};
 
 use crate::{

espflash/Cargo.toml

@@ -1,8 +1,8 @@
 [package]
 name         = "espflash"
 version      = "4.0.0-dev"
-edition      = "2021"
-rust-version = "1.82"
+edition      = "2024"
+rust-version = "1.85"
 description  = "A command-line tool for interacting with Espressif devices"
 repository   = "https://github.com/esp-rs/espflash"
 license      = "MIT OR Apache-2.0"

espflash/README.md

@@ -3,7 +3,7 @@
 
 [![Crates.io](https://img.shields.io/crates/v/espflash?labelColor=1C2C2E&color=C96329&logo=Rust&style=flat-square)](https://crates.io/crates/espflash)
 [![docs.rs](https://img.shields.io/docsrs/espflash?labelColor=1C2C2E&color=C96329&logo=rust&style=flat-square)](https://docs.rs/espflash)
-![MSRV](https://img.shields.io/badge/MSRV-1.82-blue?labelColor=1C2C2E&logo=Rust&style=flat-square)
+![MSRV](https://img.shields.io/badge/MSRV-1.85-blue?labelColor=1C2C2E&logo=Rust&style=flat-square)
 ![Crates.io](https://img.shields.io/crates/l/espflash?labelColor=1C2C2E&style=flat-square)
 
 A library and command-line tool for flashing Espressif devices.
@@ -27,7 +27,7 @@ Supports the **ESP32**, **ESP32-C2/C3/C6**, **ESP32-H2**, **ESP32-P4**, and **ES
 
 ## Installation
 
-If you are installing `espflash` from source (ie. using `cargo install`) then you must have `rustc>=1.82.0` installed on your system.
+If you are installing `espflash` from source (ie. using `cargo install`) then you must have `rustc>=1.85.0` installed on your system.
 
 To install:
 

espflash/src/bin/espflash.rs

@@ -2,6 +2,7 @@ use std::{fs, path::PathBuf};
 
 use clap::{Args, CommandFactory, Parser, Subcommand};
 use espflash::{
+    Error,
     cli::{
         self,
         config::Config,
@@ -12,9 +13,8 @@ use espflash::{
     logging::initialize_logger,
     targets::{Chip, XtalFrequency},
     update::check_for_update,
-    Error,
 };
-use log::{debug, info, LevelFilter};
+use log::{LevelFilter, debug, info};
 use miette::{IntoDiagnostic, Result, WrapErr};
 
 #[derive(Debug, Parser)]