chore: Update cli and tui to 2024 edition (#990)

Author: gtema

.github/workflows/linters.yml

@@ -56,6 +56,13 @@ jobs:
     permissions:
       contents: read
       security-events: write
+    strategy:
+      matrix:
+        include:
+          - rust_ver: 1.76
+            clippy_args: "-p openstack_sdk -p structable_derive"
+          - rust_ver: 1.85
+            clippy_args: "-p openstack_cli -p openstack_tui"
     steps:
 
       - name: Harden Runner
@@ -65,10 +72,10 @@ jobs:
 
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
 
-      - name: Install Rust ${{ env.rust_min }}
+      - name: Install Rust ${{ matrix.rust_ver }}
         uses: dtolnay/rust-toolchain@56f84321dbccf38fb67ce29ab63e4754056677e0 # stable
         with:
-          toolchain: ${{ env.rust_min }}
+          toolchain: ${{ matrix.rust_ver }}
           components: rustfmt, clippy
 
       - uses: swatinem/rust-cache@f0deed1e0edfc6a9be95417288c0e1099b1eeec3 # v2.7.7
@@ -85,51 +92,7 @@ jobs:
         run:
           cargo clippy
           --lib --tests
-          --all-features -p openstack_sdk -p openstack_cli
-          --message-format=json | ${CARGO_HOME}/bin/clippy-sarif | tee rust-clippy-results.sarif | ${CARGO_HOME}/bin/sarif-fmt
-
-      - name: Upload analysis results to GitHub
-        uses: github/codeql-action/upload-sarif@b56ba49b26e50535fa1e7f7db0f4f7b4bf65d80d # v3.28.10
-        with:
-          sarif_file: rust-clippy-results.sarif
-          wait-for-processing: true
-
-  clippy-tui:
-    name: Run clippy for TUI on the minimum supported toolchain
-    runs-on: ubuntu-latest
-    permissions:
-      contents: read
-      security-events: write
-    steps:
-
-      - name: Harden Runner
-        uses: step-security/harden-runner@4d991eb9b905ef189e4c376166672c3f2f230481 # v2.11.0
-        with:
-          egress-policy: audit
-
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
-
-      - name: Install Rust 1.80
-        uses: dtolnay/rust-toolchain@56f84321dbccf38fb67ce29ab63e4754056677e0 # stable
-        with:
-          toolchain: "1.80"
-          components: rustfmt, clippy
-
-      - uses: swatinem/rust-cache@f0deed1e0edfc6a9be95417288c0e1099b1eeec3 # v2.7.7
-
-      - name: Install cargo-binstall
-        uses: taiki-e/install-action@1426bdb9e21b806f1cae604ab3dfc05e174bf885 # v2.49.16
-        with:
-          tool: cargo-binstall
-
-      - name: Install required cargo
-        run: cargo binstall clippy-sarif sarif-fmt --force
-
-      - name: Run rust-clippy
-        run:
-          cargo clippy
-          --tests
-          --all-features -p openstack_tui
+          --all-features ${{ clippy_args }}
           --message-format=json | ${CARGO_HOME}/bin/clippy-sarif | tee rust-clippy-results.sarif | ${CARGO_HOME}/bin/sarif-fmt
 
       - name: Upload analysis results to GitHub

openstack_cli/Cargo.toml

@@ -6,8 +6,8 @@ authors = [
 ]
 description = "OpenStack client rewritten in Rust"
 categories = ["command-line-interface"]
-rust-version.workspace = true
-edition.workspace = true
+edition = "2024"
+rust-version = "1.85" # MSRV
 license.workspace = true
 homepage.workspace = true
 repository.workspace = true

openstack_cli/src/api/mod.rs

@@ -22,15 +22,15 @@ use tracing::info;
 use url::Url;
 
 use openstack_sdk::{
+    AsyncOpenStack,
     api::{AsyncClient, RestClient},
     types::ServiceType,
-    AsyncOpenStack,
 };
 
-use crate::common::parse_key_val;
-use crate::output::OutputProcessor;
 use crate::Cli;
 use crate::OpenStackCliError;
+use crate::common::parse_key_val;
+use crate::output::OutputProcessor;
 
 fn url_to_http_uri(url: Url) -> Uri {
     url.as_str()

openstack_cli/src/auth/show.rs

@@ -16,14 +16,14 @@
 use clap::Parser;
 use tracing::info;
 
-use crate::output::{self, OutputProcessor};
 use crate::Cli;
 use crate::OpenStackCliError;
 use crate::OutputConfig;
 use crate::StructTable;
+use crate::output::{self, OutputProcessor};
 
-use openstack_sdk::types::identity::v3::AuthResponse;
 use openstack_sdk::AsyncOpenStack;
+use openstack_sdk::types::identity::v3::AuthResponse;
 
 /// Show current authorization information for the cloud
 ///

openstack_cli/src/bin/osc.rs

@@ -90,17 +90,15 @@ fn initialize_panic_handler() -> Result<()> {
         .issue_url(concat!(env!("CARGO_PKG_REPOSITORY"), "/issues/new"))
         .issue_filter(|kind| match kind {
             color_eyre::ErrorKind::NonRecoverable(_) => true,
-            color_eyre::ErrorKind::Recoverable(error) => {
-                match error.downcast_ref::<OpenStackCliError>() {
-                    Some(OpenStackCliError::Auth { .. }) => false,
-                    Some(OpenStackCliError::ConfigError { .. }) => false,
-                    Some(OpenStackCliError::ConnectionNotFound { .. }) => false,
-                    Some(OpenStackCliError::OpenStackApi { .. }) => false,
-                    Some(OpenStackCliError::ReScope { .. }) => false,
-                    Some(OpenStackCliError::InputParameters { .. }) => false,
-                    _ => true,
-                }
-            }
+            color_eyre::ErrorKind::Recoverable(error) => !matches!(
+                error.downcast_ref::<OpenStackCliError>(),
+                Some(OpenStackCliError::Auth { .. })
+                    | Some(OpenStackCliError::ConfigError { .. })
+                    | Some(OpenStackCliError::ConnectionNotFound { .. })
+                    | Some(OpenStackCliError::OpenStackApi { .. })
+                    | Some(OpenStackCliError::ReScope { .. })
+                    | Some(OpenStackCliError::InputParameters { .. })
+            ),
         })
         .add_issue_metadata("version", env!("CARGO_PKG_VERSION"))
         .add_issue_metadata("command", command)

openstack_cli/src/block_storage/v3.rs

@@ -15,7 +15,7 @@
 //! Block storage v3 commands
 use clap::{Parser, Subcommand};
 
-use openstack_sdk::{types::ServiceType, AsyncOpenStack};
+use openstack_sdk::{AsyncOpenStack, types::ServiceType};
 
 use crate::{Cli, OpenStackCliError};
 

openstack_cli/src/block_storage/v3/attachment/create_327.rs

@@ -25,15 +25,15 @@ use tracing::info;
 
 use openstack_sdk::AsyncOpenStack;
 
-use crate::output::OutputProcessor;
 use crate::Cli;
 use crate::OpenStackCliError;
 use crate::OutputConfig;
 use crate::StructTable;
+use crate::output::OutputProcessor;
 
 use crate::common::parse_key_val;
-use openstack_sdk::api::block_storage::v3::attachment::create_327;
 use openstack_sdk::api::QueryAsync;
+use openstack_sdk::api::block_storage::v3::attachment::create_327;
 use serde_json::Value;
 use structable_derive::StructTable;
 

openstack_cli/src/block_storage/v3/attachment/create_354.rs

@@ -25,16 +25,16 @@ use tracing::info;
 
 use openstack_sdk::AsyncOpenStack;
 
-use crate::output::OutputProcessor;
 use crate::Cli;
 use crate::OpenStackCliError;
 use crate::OutputConfig;
 use crate::StructTable;
+use crate::output::OutputProcessor;
 
 use crate::common::parse_key_val;
 use clap::ValueEnum;
-use openstack_sdk::api::block_storage::v3::attachment::create_354;
 use openstack_sdk::api::QueryAsync;
+use openstack_sdk::api::block_storage::v3::attachment::create_354;
 use serde_json::Value;
 use structable_derive::StructTable;
 

openstack_cli/src/block_storage/v3/attachment/delete.rs

@@ -25,16 +25,16 @@ use tracing::info;
 
 use openstack_sdk::AsyncOpenStack;
 
-use crate::output::OutputProcessor;
 use crate::Cli;
 use crate::OpenStackCliError;
 use crate::OutputConfig;
 use crate::StructTable;
+use crate::output::OutputProcessor;
 
 use bytes::Bytes;
 use http::Response;
-use openstack_sdk::api::block_storage::v3::attachment::delete;
 use openstack_sdk::api::RawQueryAsync;
+use openstack_sdk::api::block_storage::v3::attachment::delete;
 use structable_derive::StructTable;
 
 /// Delete an attachment.

openstack_cli/src/block_storage/v3/attachment/list.rs

@@ -25,15 +25,15 @@ use tracing::info;
 
 use openstack_sdk::AsyncOpenStack;
 
-use crate::output::OutputProcessor;
 use crate::Cli;
 use crate::OpenStackCliError;
 use crate::OutputConfig;
 use crate::StructTable;
+use crate::output::OutputProcessor;
 
-use openstack_sdk::api::block_storage::v3::attachment::list_detailed;
 use openstack_sdk::api::QueryAsync;
-use openstack_sdk::api::{paged, Pagination};
+use openstack_sdk::api::block_storage::v3::attachment::list_detailed;
+use openstack_sdk::api::{Pagination, paged};
 use serde_json::Value;
 use structable_derive::StructTable;