From 0c7f8cfb9b1c2077eb5df24f96cead4f7d6b6bf5 Mon Sep 17 00:00:00 2001 From: David Rauschenbach Date: Thu, 12 Feb 2026 05:17:45 -0800 Subject: [PATCH 1/2] =?UTF-8?q?Upgrade=20Rust=20edition=20from=202021=20?= =?UTF-8?q?=E2=86=92=202024?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGELOG.md | 1 + Cargo.toml | 2 +- src/apiclient/user_service_client.rs | 8 ++++---- src/cmd/enable/identity_provider.rs | 2 +- src/cmd/enable/payment_provider.rs | 2 +- src/cmd/enable/storage_provider.rs | 2 +- src/cmd/generate/controller.rs | 2 +- src/cmd/generate/do_generate_preflight.rs | 2 +- src/cmd/generate/model.rs | 2 +- src/cmd/generate/resource.rs | 2 +- src/cmd/generate/service.rs | 2 +- src/cmd/initialize/mod.rs | 2 +- src/cmd/login/mod.rs | 2 +- 13 files changed, 16 insertions(+), 15 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5ef0f3d..83591e9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,7 @@ ## [Unreleased] ### Changed +- [#94](https://github.com/saas-rs/cli/issues/94) Upgrade Rust edition from 2021 → 2024 - [#92](https://github.com/saas-rs/cli/issues/92) Upgrade Rust from 1.89.0 → 1.93.0 - [#90](https://github.com/saas-rs/cli/issues/90) Add default LinkedAccount fields to CLI display: providerUid, ownerAccountId diff --git a/Cargo.toml b/Cargo.toml index fb85524..15ce7d3 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -6,7 +6,7 @@ authors = ["David Rauschenbach "] homepage = "https://docs.saas-rs.com" repository = "https://github.com/saas-rs/cli.git" license = "MIT" -edition = "2021" +edition = "2024" [[bin]] name = "saas-rs" diff --git a/src/apiclient/user_service_client.rs b/src/apiclient/user_service_client.rs index 864b349..63be3f8 100644 --- a/src/apiclient/user_service_client.rs +++ b/src/apiclient/user_service_client.rs @@ -1,16 +1,16 @@ use super::channel::new_channel; -use crate::protocol::saas_rs::user::v1::user_client::UserClient; use crate::AppOpts; +use crate::protocol::saas_rs::user::v1::user_client::UserClient; use crate::{config, consts}; use clap::Parser; use log::trace; use std::error::Error; use tonic::codegen::InterceptedService; use tonic::transport::Channel; -use tonic::{metadata::MetadataValue, Request, Status}; +use tonic::{Request, Status, metadata::MetadataValue}; -pub async fn new_user_service_client( -) -> Result) -> Result, Status>>>, Box> { +pub async fn new_user_service_client() +-> Result) -> Result, Status>>>, Box> { new_user_service_client_with_ignore_config(false).await } diff --git a/src/cmd/enable/identity_provider.rs b/src/cmd/enable/identity_provider.rs index 6f85067..73e6236 100644 --- a/src/cmd/enable/identity_provider.rs +++ b/src/cmd/enable/identity_provider.rs @@ -1,7 +1,7 @@ use crate::cmd::generate::{do_generate, do_generate_preflight}; use crate::protocol::saas_rs::user::v1::{ - generate_request::{self, use_identity_provider::Provider, UseIdentityProvider}, GenerateRequest, + generate_request::{self, UseIdentityProvider, use_identity_provider::Provider}, }; use clap::{ builder::PossibleValue, diff --git a/src/cmd/enable/payment_provider.rs b/src/cmd/enable/payment_provider.rs index 57a691b..dd395c3 100644 --- a/src/cmd/enable/payment_provider.rs +++ b/src/cmd/enable/payment_provider.rs @@ -1,8 +1,8 @@ use crate::cmd::generate::{do_generate, do_generate_preflight}; use crate::protocol::saas_rs::user::v1::generate_request::UsePaymentProvider; use crate::protocol::saas_rs::user::v1::{ - generate_request::{self, use_payment_provider::Provider}, GenerateRequest, + generate_request::{self, use_payment_provider::Provider}, }; use clap::{ builder::PossibleValue, diff --git a/src/cmd/enable/storage_provider.rs b/src/cmd/enable/storage_provider.rs index 6a20f57..c688412 100644 --- a/src/cmd/enable/storage_provider.rs +++ b/src/cmd/enable/storage_provider.rs @@ -1,7 +1,7 @@ use crate::cmd::generate::{do_generate, do_generate_preflight}; use crate::protocol::saas_rs::user::v1::{ - generate_request::{self, use_storage_provider::Provider, UseStorageProvider}, GenerateRequest, + generate_request::{self, UseStorageProvider, use_storage_provider::Provider}, }; use clap::{ builder::PossibleValue, diff --git a/src/cmd/generate/controller.rs b/src/cmd/generate/controller.rs index 247601d..b08a65f 100644 --- a/src/cmd/generate/controller.rs +++ b/src/cmd/generate/controller.rs @@ -1,7 +1,7 @@ use crate::cmd::generate::{do_generate, do_generate_preflight}; use crate::protocol::saas_rs::user::v1::{ - generate_request::{self, Controller}, GenerateRequest, + generate_request::{self, Controller}, }; use clap::Parser; diff --git a/src/cmd/generate/do_generate_preflight.rs b/src/cmd/generate/do_generate_preflight.rs index 254c6e9..6f4716c 100644 --- a/src/cmd/generate/do_generate_preflight.rs +++ b/src/cmd/generate/do_generate_preflight.rs @@ -1,6 +1,6 @@ use crate::protocol::saas_rs::user::v1::{ generate_request::{Archive, Snapshot}, - {upload_file_request, FileInfo, UploadFileRequest}, + {FileInfo, UploadFileRequest, upload_file_request}, }; use crate::{apiclient, util}; use git2::Repository; diff --git a/src/cmd/generate/model.rs b/src/cmd/generate/model.rs index 30c820b..02b2377 100644 --- a/src/cmd/generate/model.rs +++ b/src/cmd/generate/model.rs @@ -1,7 +1,7 @@ use crate::cmd::generate::{do_generate, do_generate_preflight}; use crate::protocol::saas_rs::user::v1::{ - generate_request::{self, Field, Model}, GenerateRequest, + generate_request::{self, Field, Model}, }; use clap::Parser; diff --git a/src/cmd/generate/resource.rs b/src/cmd/generate/resource.rs index 1a6dd40..0e6c822 100644 --- a/src/cmd/generate/resource.rs +++ b/src/cmd/generate/resource.rs @@ -1,7 +1,7 @@ use crate::cmd::generate::{do_generate, do_generate_preflight}; use crate::protocol::saas_rs::user::v1::{ - generate_request::{self, Field, Resource}, GenerateRequest, + generate_request::{self, Field, Resource}, }; use clap::Parser; diff --git a/src/cmd/generate/service.rs b/src/cmd/generate/service.rs index 41d3558..eef374f 100644 --- a/src/cmd/generate/service.rs +++ b/src/cmd/generate/service.rs @@ -1,7 +1,7 @@ use crate::cmd::generate::{do_generate, do_generate_preflight}; use crate::protocol::saas_rs::user::v1::{ - generate_request::{self, Service}, GenerateRequest, + generate_request::{self, Service}, }; use clap::Parser; diff --git a/src/cmd/initialize/mod.rs b/src/cmd/initialize/mod.rs index 3fedd00..0dbd32f 100644 --- a/src/cmd/initialize/mod.rs +++ b/src/cmd/initialize/mod.rs @@ -1,6 +1,6 @@ use crate::cmd::generate::{do_generate, do_generate_preflight}; -use crate::protocol::saas_rs::user::v1::generate_request::{Init, What}; use crate::protocol::saas_rs::user::v1::GenerateRequest; +use crate::protocol::saas_rs::user::v1::generate_request::{Init, What}; use clap::Parser; #[derive(Debug, Parser)] diff --git a/src/cmd/login/mod.rs b/src/cmd/login/mod.rs index 6097eca..dc20e87 100644 --- a/src/cmd/login/mod.rs +++ b/src/cmd/login/mod.rs @@ -2,7 +2,7 @@ use crate::protocol::saas_rs::user::v1::FindAccountRequest; use crate::{apiclient, config, consts}; use actix_cors::Cors; use actix_web::web::Data; -use actix_web::{post, web, App, HttpServer, Responder}; +use actix_web::{App, HttpServer, Responder, post, web}; use clap::Parser; use log::trace; use serde::Deserialize; From 4106f383fdb96f5999f4770fb76087aef333ed24 Mon Sep 17 00:00:00 2001 From: David Rauschenbach Date: Thu, 12 Feb 2026 05:24:14 -0800 Subject: [PATCH 2/2] fix --- src/cmd/generate/do_generate.rs | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/cmd/generate/do_generate.rs b/src/cmd/generate/do_generate.rs index 9e75adb..7d62e32 100644 --- a/src/cmd/generate/do_generate.rs +++ b/src/cmd/generate/do_generate.rs @@ -52,11 +52,11 @@ pub async fn do_generate(req: GenerateRequest) -> Result<(), Box