From f9b7dae0a8a6ec0022fdcf8705eac549cbdf7735 Mon Sep 17 00:00:00 2001 From: Jesse Braham Date: Fri, 28 Oct 2022 15:03:43 -0700 Subject: [PATCH] Bump MSRV to 1.62.0 and update all dependencies (#279) * Bump the MSRV to 1.62.0 * Update all dependencies --- .github/workflows/raspberry_rust.yml | 2 +- .github/workflows/rust.yml | 2 +- Cargo.lock | 8 ++++---- cargo-espflash/Cargo.toml | 11 +++++------ cargo-espflash/README.md | 6 +++--- espflash/Cargo.toml | 11 +++++------ espflash/README.md | 6 +++--- 7 files changed, 22 insertions(+), 24 deletions(-) diff --git a/.github/workflows/raspberry_rust.yml b/.github/workflows/raspberry_rust.yml index f3ef2ca..cb02151 100644 --- a/.github/workflows/raspberry_rust.yml +++ b/.github/workflows/raspberry_rust.yml @@ -28,7 +28,7 @@ jobs: cargo-command: check args: --features=raspberry - name: Check MSRV - toolchain: "1.60" + toolchain: "1.62" cargo-command: check args: --features=raspberry - name: Unit Test diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index 4af32fd..6fe0830 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -44,7 +44,7 @@ jobs: - uses: actions-rs/toolchain@v1 with: profile: minimal - toolchain: "1.60" + toolchain: "1.62" override: true - uses: Swatinem/rust-cache@v1 - uses: actions-rs/cargo@v1 diff --git a/Cargo.lock b/Cargo.lock index 449e7a8..c01214b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -258,9 +258,9 @@ dependencies = [ [[package]] name = "cargo_toml" -version = "0.12.4" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a621d5d6d6c8d086dbaf1fe659981da41a1b63c6bdbba30b4dbb592c6d3bd49" +checksum = "aa0e3586af56b3bfa51fca452bd56e8dbbbd5d8d81cbf0b7e4e35b695b537eb8" dependencies = [ "serde", "toml", @@ -323,9 +323,9 @@ dependencies = [ [[package]] name = "comfy-table" -version = "6.1.0" +version = "6.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85914173c2f558d61613bfbbf1911f14e630895087a7ed2fafc0f5319e1536e7" +checksum = "1090f39f45786ec6dc6286f8ea9c75d0a7ef0a0d3cda674cef0c3af7b307fbc2" dependencies = [ "crossterm", "strum", diff --git a/cargo-espflash/Cargo.toml b/cargo-espflash/Cargo.toml index cacbd6e..f04daaa 100644 --- a/cargo-espflash/Cargo.toml +++ b/cargo-espflash/Cargo.toml @@ -6,7 +6,7 @@ authors = [ "Jesse Braham ", ] edition = "2021" -rust-version = "1.60" +rust-version = "1.62" description = "Cargo subcommand for flashing Espressif devices over serial" repository = "https://github.com/esp-rs/espflash" license = "MIT OR Apache-2.0" @@ -15,7 +15,6 @@ keywords = [ "cli", "embedded", "esp", - "xtensa", ] categories = [ "command-line-utilities", @@ -30,15 +29,15 @@ bin-dir = "{ bin }{ binary-ext }" pkg-fmt = "zip" [dependencies] -cargo_metadata = "0.15.0" -cargo_toml = "0.12.2" -clap = { version = "4.0.14", features = ["derive"] } +cargo_metadata = "0.15.1" +cargo_toml = "0.13.0" +clap = { version = "4.0.18", features = ["derive"] } env_logger = "0.9.1" espflash = { version = "=2.0.0-dev", path = "../espflash" } esp-idf-part = "0.1.1" log = "0.4.17" miette = { version = "5.3.0", features = ["fancy"] } -serde = { version = "1.0.145", features = ["derive"] } +serde = { version = "1.0.147", features = ["derive"] } strum = "0.24.1" thiserror = "1.0.37" toml = "0.5.9" diff --git a/cargo-espflash/README.md b/cargo-espflash/README.md index fdd4a0d..c8ed746 100644 --- a/cargo-espflash/README.md +++ b/cargo-espflash/README.md @@ -1,7 +1,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.60-blue?labelColor=1C2C2E&logo=Rust&style=flat-square) +![MSRV](https://img.shields.io/badge/MSRV-1.62-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 over serial. @@ -10,7 +10,7 @@ Supports the **ESP32**, **ESP32-C2**, **ESP32-C3**, **ESP32-S2**, **ESP32-S3**, ## Installation -If you are installing `cargo-espflash` from source (ie. using `cargo install`) then you must have `rustc>=1.60.0` installed on your system. +If you are installing `cargo-espflash` from source (ie. using `cargo install`) then you must have `rustc>=1.62.0` installed on your system. If you are running **macOS** or **Linux** then [libuv] must also be installed; this is available via most popular package managers. If you are running **Windows** you can ignore this step. @@ -48,7 +48,7 @@ cargo install cargo-espflash --features=raspberry ## Usage ```text -A cargo extension for flashing Espressif devices +Cargo subcommand for flashing Espressif devices over serial Usage: cargo espflash diff --git a/espflash/Cargo.toml b/espflash/Cargo.toml index f44348e..3b32f1e 100644 --- a/espflash/Cargo.toml +++ b/espflash/Cargo.toml @@ -6,7 +6,7 @@ authors = [ "Jesse Braham ", ] edition = "2021" -rust-version = "1.60" +rust-version = "1.62" description = "A command-line tool for flashing Espressif devices over serial" repository = "https://github.com/esp-rs/espflash" license = "MIT OR Apache-2.0" @@ -14,7 +14,6 @@ keywords = [ "cli", "embedded", "esp", - "xtensa", ] categories = [ "command-line-utilities", @@ -37,11 +36,11 @@ required-features = ["cli"] [dependencies] addr2line = "0.18.0" -base64 = "0.13.0" +base64 = "0.13.1" binread = "2.2.0" bytemuck = { version = "1.12.1", features = ["derive"] } -clap = { version = "4.0.14", features = ["derive"], optional = true } -comfy-table = "6.1.0" +clap = { version = "4.0.18", features = ["derive"], optional = true } +comfy-table = "6.1.2" crossterm = { version = "0.25.0", optional = true } dialoguer = { version = "0.10.2", optional = true } directories-next = "2.0.0" @@ -55,7 +54,7 @@ miette = { version = "5.3.0", features = ["fancy"] } parse_int = "0.6.0" regex = "1.6.0" rppal = { version = "0.13.1", optional = true } -serde = { version = "1.0.145", features = ["derive"] } +serde = { version = "1.0.147", features = ["derive"] } serde-hex = "0.1.0" serialport = "4.2.0" sha2 = "0.10.6" diff --git a/espflash/README.md b/espflash/README.md index 8ad545c..34f224f 100644 --- a/espflash/README.md +++ b/espflash/README.md @@ -2,7 +2,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.60-blue?labelColor=1C2C2E&logo=Rust&style=flat-square) +![MSRV](https://img.shields.io/badge/MSRV-1.62-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 over serial. @@ -11,7 +11,7 @@ Supports the **ESP32**, **ESP32-C2**, **ESP32-C3**, **ESP32-S2**, **ESP32-S3**, ## Installation -If you are installing `espflash` from source (ie. using `cargo install`) then you must have `rustc>=1.60.0` installed on your system. +If you are installing `espflash` from source (ie. using `cargo install`) then you must have `rustc>=1.62.0` installed on your system. If you are running **macOS** or **Linux** then [libuv] must also be installed; this is available via most popular package managers. If you are running **Windows** you can ignore this step. @@ -49,7 +49,7 @@ cargo install espflash --features=raspberry ## Usage ```text -A library and command-line tool for flashing Espressif devices +A command-line tool for flashing Espressif devices over serial Usage: espflash