Skip to content

feat: Update to 2024 rust edition #1658

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
gtema merged 1 commit into from
Feb 27, 2026
Merged

feat: Update to 2024 rust edition #1658

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@ default-members = ["openstack_cli", "openstack_sdk", "openstack_tui", "openstack

[workspace.package]
license = "Apache-2.0"
edition = "2021"
edition = "2024"
authors = ["Artem Goncharov (gtema)"]
rust-version = "1.76" # MSRV
rust-version = "1.88" # MSRV
homepage = "https://github.com/gtema/openstack"
repository = "https://github.com/gtema/openstack"

Expand Down
4 changes: 2 additions & 2 deletions openstack_cli/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ authors = [
]
description = "OpenStack client rewritten in Rust"
categories = ["command-line-interface"]
edition = "2024"
rust-version = "1.85" # MSRV
edition.workspace = true
rust-version.workspace = true # MSRV
license.workspace = true
homepage.workspace = true
repository.workspace = true
Expand Down
6 changes: 3 additions & 3 deletions openstack_sdk/examples/ignore.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@
//!
use std::env;

use openstack_sdk::api::ignore;
use openstack_sdk::api::QueryAsync;
use openstack_sdk::OpenStackError;
use openstack_sdk::{config::ConfigFile, AsyncOpenStack};
use openstack_sdk::api::QueryAsync;
use openstack_sdk::api::ignore;
use openstack_sdk::{AsyncOpenStack, config::ConfigFile};

use openstack_sdk::api::compute::v2::flavor::get;

Expand Down
6 changes: 3 additions & 3 deletions openstack_sdk/examples/paged.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@ use serde::Deserialize;
use serde_json::Value;
use std::env;

use openstack_sdk::api::paged;
use openstack_sdk::OpenStackError;
use openstack_sdk::api::Pagination;
use openstack_sdk::api::QueryAsync;
use openstack_sdk::OpenStackError;
use openstack_sdk::{config::ConfigFile, AsyncOpenStack};
use openstack_sdk::api::paged;
use openstack_sdk::{AsyncOpenStack, config::ConfigFile};

use openstack_sdk::api::compute::v2::flavor::list_detailed;

Expand Down
4 changes: 2 additions & 2 deletions openstack_sdk/examples/query.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@
use serde_json::Value;
use std::env;

use openstack_sdk::api::QueryAsync;
use openstack_sdk::OpenStackError;
use openstack_sdk::{config::ConfigFile, AsyncOpenStack};
use openstack_sdk::api::QueryAsync;
use openstack_sdk::{AsyncOpenStack, config::ConfigFile};

use openstack_sdk::api::compute::v2::flavor::get;

Expand Down
6 changes: 3 additions & 3 deletions openstack_sdk/examples/query_find.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@ use serde::Deserialize;
use serde_json::Value;
use std::env;

use openstack_sdk::api::find;
use openstack_sdk::api::QueryAsync;
use openstack_sdk::OpenStackError;
use openstack_sdk::{config::ConfigFile, AsyncOpenStack};
use openstack_sdk::api::QueryAsync;
use openstack_sdk::api::find;
use openstack_sdk::{AsyncOpenStack, config::ConfigFile};

use openstack_sdk::api::compute::v2::flavor::find;

Expand Down
2 changes: 1 addition & 1 deletion openstack_sdk/src/api.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,8 +173,8 @@ pub use self::error::BodyError;

pub use self::client::RestClient;

pub use self::rest_endpoint::check_response_error;
pub use self::rest_endpoint::RestEndpoint;
pub use self::rest_endpoint::check_response_error;

#[cfg(feature = "async")]
pub use self::client::AsyncClient;
Expand Down
14 changes: 8 additions & 6 deletions openstack_sdk/src/api/block_storage/v3/attachment/os_complete_344.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,12 +137,14 @@ mod tests {

#[test]
fn test_response_key() {
assert!(Request::builder()
.os_complete(json!({}))
.build()
.unwrap()
.response_key()
.is_none())
assert!(
Request::builder()
.os_complete(json!({}))
.build()
.unwrap()
.response_key()
.is_none()
)
}

#[cfg(feature = "sync")]
Expand Down
14 changes: 8 additions & 6 deletions openstack_sdk/src/api/block_storage/v3/backup/os_force_delete.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,12 +140,14 @@ mod tests {

#[test]
fn test_response_key() {
assert!(Request::builder()
.os_force_delete(json!({}))
.build()
.unwrap()
.response_key()
.is_none())
assert!(
Request::builder()
.os_force_delete(json!({}))
.build()
.unwrap()
.response_key()
.is_none()
)
}

#[cfg(feature = "sync")]
Expand Down
24 changes: 13 additions & 11 deletions openstack_sdk/src/api/block_storage/v3/backup/os_reset_status.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,17 +153,19 @@ mod tests {

#[test]
fn test_response_key() {
assert!(Request::builder()
.os_reset_status(
OsResetStatusBuilder::default()
.status("foo")
.build()
.unwrap()
)
.build()
.unwrap()
.response_key()
.is_none())
assert!(
Request::builder()
.os_reset_status(
OsResetStatusBuilder::default()
.status("foo")
.build()
.unwrap()
)
.build()
.unwrap()
.response_key()
.is_none()
)
}

#[cfg(feature = "sync")]
Expand Down
24 changes: 13 additions & 11 deletions openstack_sdk/src/api/block_storage/v3/cgsnapshot/create.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,17 +198,19 @@ mod tests {

#[test]
fn test_response_key() {
assert!(Request::builder()
.cgsnapshot(
CgsnapshotBuilder::default()
.consistencygroup_id("foo")
.build()
.unwrap()
)
.build()
.unwrap()
.response_key()
.is_none())
assert!(
Request::builder()
.cgsnapshot(
CgsnapshotBuilder::default()
.consistencygroup_id("foo")
.build()
.unwrap()
)
.build()
.unwrap()
.response_key()
.is_none()
)
}

#[cfg(feature = "sync")]
Expand Down
24 changes: 13 additions & 11 deletions openstack_sdk/src/api/block_storage/v3/consistencygroup/create.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,17 +206,19 @@ mod tests {

#[test]
fn test_response_key() {
assert!(Request::builder()
.consistencygroup(
ConsistencygroupBuilder::default()
.volume_types(json!({}))
.build()
.unwrap()
)
.build()
.unwrap()
.response_key()
.is_none())
assert!(
Request::builder()
.consistencygroup(
ConsistencygroupBuilder::default()
.volume_types(json!({}))
.build()
.unwrap()
)
.build()
.unwrap()
.response_key()
.is_none()
)
}

#[cfg(feature = "sync")]
Expand Down
16 changes: 10 additions & 6 deletions openstack_sdk/src/api/block_storage/v3/consistencygroup/create_from_src/create.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,12 +206,16 @@ mod tests {

#[test]
fn test_response_key() {
assert!(Request::builder()
.consistencygroup_from_src(ConsistencygroupFromSrcBuilder::default().build().unwrap())
.build()
.unwrap()
.response_key()
.is_none())
assert!(
Request::builder()
.consistencygroup_from_src(
ConsistencygroupFromSrcBuilder::default().build().unwrap()
)
.build()
.unwrap()
.response_key()
.is_none()
)
}

#[cfg(feature = "sync")]
Expand Down
14 changes: 8 additions & 6 deletions openstack_sdk/src/api/block_storage/v3/consistencygroup/set.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -213,12 +213,14 @@ mod tests {

#[test]
fn test_response_key() {
assert!(Request::builder()
.consistencygroup(ConsistencygroupBuilder::default().build().unwrap())
.build()
.unwrap()
.response_key()
.is_none())
assert!(
Request::builder()
.consistencygroup(ConsistencygroupBuilder::default().build().unwrap())
.build()
.unwrap()
.response_key()
.is_none()
)
}

#[cfg(feature = "sync")]
Expand Down
14 changes: 8 additions & 6 deletions openstack_sdk/src/api/block_storage/v3/group/create_from_src_314.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,12 +156,14 @@ mod tests {

#[test]
fn test_response_key() {
assert!(Request::builder()
.create_from_src(CreateFromSrcBuilder::default().build().unwrap())
.build()
.unwrap()
.response_key()
.is_none())
assert!(
Request::builder()
.create_from_src(CreateFromSrcBuilder::default().build().unwrap())
.build()
.unwrap()
.response_key()
.is_none()
)
}

#[cfg(feature = "sync")]
Expand Down
14 changes: 8 additions & 6 deletions openstack_sdk/src/api/block_storage/v3/group/delete_313.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,12 +140,14 @@ mod tests {

#[test]
fn test_response_key() {
assert!(Request::builder()
.delete(DeleteBuilder::default().build().unwrap())
.build()
.unwrap()
.response_key()
.is_none())
assert!(
Request::builder()
.delete(DeleteBuilder::default().build().unwrap())
.build()
.unwrap()
.response_key()
.is_none()
)
}

#[cfg(feature = "sync")]
Expand Down
14 changes: 8 additions & 6 deletions openstack_sdk/src/api/block_storage/v3/group/disable_replication_338.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,12 +147,14 @@ mod tests {

#[test]
fn test_response_key() {
assert!(Request::builder()
.disable_replication(BTreeMap::<String, Value>::new().into_iter())
.build()
.unwrap()
.response_key()
.is_none())
assert!(
Request::builder()
.disable_replication(BTreeMap::<String, Value>::new().into_iter())
.build()
.unwrap()
.response_key()
.is_none()
)
}

#[cfg(feature = "sync")]
Expand Down
14 changes: 8 additions & 6 deletions openstack_sdk/src/api/block_storage/v3/group/enable_replication_338.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,12 +147,14 @@ mod tests {

#[test]
fn test_response_key() {
assert!(Request::builder()
.enable_replication(BTreeMap::<String, Value>::new().into_iter())
.build()
.unwrap()
.response_key()
.is_none())
assert!(
Request::builder()
.enable_replication(BTreeMap::<String, Value>::new().into_iter())
.build()
.unwrap()
.response_key()
.is_none()
)
}

#[cfg(feature = "sync")]
Expand Down
14 changes: 8 additions & 6 deletions openstack_sdk/src/api/block_storage/v3/group/failover_replication_338.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,12 +148,14 @@ mod tests {

#[test]
fn test_response_key() {
assert!(Request::builder()
.failover_replication(FailoverReplicationBuilder::default().build().unwrap())
.build()
.unwrap()
.response_key()
.is_none())
assert!(
Request::builder()
.failover_replication(FailoverReplicationBuilder::default().build().unwrap())
.build()
.unwrap()
.response_key()
.is_none()
)
}

#[cfg(feature = "sync")]
Expand Down
14 changes: 8 additions & 6 deletions openstack_sdk/src/api/block_storage/v3/group/list_replication_targets_338.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,12 +147,14 @@ mod tests {

#[test]
fn test_response_key() {
assert!(Request::builder()
.list_replication_targets(BTreeMap::<String, Value>::new().into_iter())
.build()
.unwrap()
.response_key()
.is_none())
assert!(
Request::builder()
.list_replication_targets(BTreeMap::<String, Value>::new().into_iter())
.build()
.unwrap()
.response_key()
.is_none()
)
}

#[cfg(feature = "sync")]
Expand Down
Loading