Skip to content

Update to Rust 2024 Edition #430

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
notpeter merged 5 commits into from
Apr 30, 2026
Merged

Update to Rust 2024 Edition #430

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
0de5668
Bump cargo.toml
notpeter Apr 30, 2026
3ecd5d8
Fix gen as reserved keyword
notpeter Apr 30, 2026
82f4c25
Hold off on styleedition 2024 changes
notpeter Apr 30, 2026
7be5d9b
Clippy fixes.
notpeter Apr 30, 2026
8188708
cargo fmt
notpeter Apr 30, 2026
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
14 changes: 7 additions & 7 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 5 additions & 0 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,11 @@ members = [
]
resolver = "2"

[workspace.package]
publish = true
edition = "2024"
version = "0.3.0"

[workspace.dependencies]
anyhow = "1.0"
async-bb8-diesel = "0.3"
Expand Down
5 changes: 3 additions & 2 deletions dropshot-authorization-header/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
[package]
name = "dropshot-authorization-header"
version = "0.1.0"
edition = "2021"
version.workspace = true
edition.workspace = true
publish.workspace = true

# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

Expand Down
2 changes: 2 additions & 0 deletions rustfmt.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
style_edition = "2021"
edition = "2024"
5 changes: 3 additions & 2 deletions v-api-installer/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
[package]
name = "v-api-installer"
version = "0.2.0"
edition = "2021"
version.workspace = true
edition.workspace = true
publish.workspace = true

[lib]
name = "v_api_installer"
Expand Down
5 changes: 3 additions & 2 deletions v-api-param/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
[package]
name = "v-api-param"
version = "0.2.0"
edition = "2021"
version.workspace = true
edition.workspace = true
publish.workspace = true

[dependencies]
secrecy = { workspace = true, features = ["serde"] }
Expand Down
5 changes: 3 additions & 2 deletions v-api-permission-derive/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
[package]
name = "v-api-permission-derive"
version = "0.2.0"
edition = "2021"
version.workspace = true
edition.workspace = true
publish.workspace = true

[lib]
proc-macro = true
Expand Down
5 changes: 3 additions & 2 deletions v-api/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
[package]
name = "v-api"
version = "0.2.0"
edition = "2021"
version.workspace = true
edition.workspace = true
publish.workspace = true

[features]
default = ["sagas"]
Expand Down
6 changes: 2 additions & 4 deletions v-api/src/context/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -494,7 +494,7 @@ where
tracing::debug!(?mapped_permissions, "Computed mapping permissions");
tracing::debug!(?mapped_groups, "Computed mapped groups");

let user = match api_user_providers.len() {
match api_user_providers.len() {
0 => {
tracing::info!(
?mapped_permissions,
Expand Down Expand Up @@ -585,9 +585,7 @@ where
"Multiple providers for external id found".to_string(),
)))
}
};

user
}
}

pub async fn generate_access_token(
Expand Down
2 changes: 1 addition & 1 deletion v-api/src/secrets.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ impl JsonSchema for OpenApiSecretString {
true
}

fn json_schema(_: &mut schemars::gen::SchemaGenerator) -> schemars::schema::Schema {
fn json_schema(_: &mut schemars::r#gen::SchemaGenerator) -> schemars::schema::Schema {
SchemaObject {
instance_type: Some(InstanceType::String.into()),
..Default::default()
Expand Down
5 changes: 3 additions & 2 deletions v-model/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
[package]
name = "v-model"
version = "0.2.0"
edition = "2021"
version.workspace = true
edition.workspace = true
publish.workspace = true

# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

Expand Down
30 changes: 15 additions & 15 deletions v-model/src/saga/jsonschema.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ impl JsonSchema for SagaDagWrapper {
"SagaDag".to_string()
}

fn json_schema(gen: &mut schemars::gen::SchemaGenerator) -> schemars::schema::Schema {
fn json_schema(generator: &mut schemars::r#gen::SchemaGenerator) -> schemars::schema::Schema {
use schemars::schema::*;

// Define the InternalNode enum schema
Expand All @@ -38,7 +38,7 @@ impl JsonSchema for SagaDagWrapper {
let mut inner_props = schemars::Map::new();
inner_props.insert(
"params".to_string(),
gen.subschema_for::<serde_json::Value>(),
generator.subschema_for::<serde_json::Value>(),
);
inner_props
},
Expand Down Expand Up @@ -82,15 +82,15 @@ impl JsonSchema for SagaDagWrapper {
let mut inner_props = schemars::Map::new();
inner_props.insert(
"name".to_string(),
gen.subschema_for::<String>(),
generator.subschema_for::<String>(),
);
inner_props.insert(
"label".to_string(),
gen.subschema_for::<String>(),
generator.subschema_for::<String>(),
);
inner_props.insert(
"action_name".to_string(),
gen.subschema_for::<String>(),
generator.subschema_for::<String>(),
);
inner_props
},
Expand Down Expand Up @@ -128,11 +128,11 @@ impl JsonSchema for SagaDagWrapper {
let mut inner_props = schemars::Map::new();
inner_props.insert(
"name".to_string(),
gen.subschema_for::<String>(),
generator.subschema_for::<String>(),
);
inner_props.insert(
"value".to_string(),
gen.subschema_for::<serde_json::Value>(),
generator.subschema_for::<serde_json::Value>(),
);
inner_props
},
Expand Down Expand Up @@ -166,11 +166,11 @@ impl JsonSchema for SagaDagWrapper {
let mut inner_props = schemars::Map::new();
inner_props.insert(
"saga_name".to_string(),
gen.subschema_for::<String>(),
generator.subschema_for::<String>(),
);
inner_props.insert(
"params_node_name".to_string(),
gen.subschema_for::<String>(),
generator.subschema_for::<String>(),
);
inner_props
},
Expand Down Expand Up @@ -207,7 +207,7 @@ impl JsonSchema for SagaDagWrapper {
let mut inner_props = schemars::Map::new();
inner_props.insert(
"name".to_string(),
gen.subschema_for::<String>(),
generator.subschema_for::<String>(),
);
inner_props
},
Expand Down Expand Up @@ -262,7 +262,7 @@ impl JsonSchema for SagaDagWrapper {
instance_type: Some(InstanceType::Array.into()),
array: Some(Box::new(ArrayValidation {
items: Some(SingleOrVec::Single(Box::new(
gen.subschema_for::<u32>(),
generator.subschema_for::<u32>(),
))),
..Default::default()
})),
Expand Down Expand Up @@ -294,7 +294,7 @@ impl JsonSchema for SagaDagWrapper {
instance_type: Some(InstanceType::Array.into()),
array: Some(Box::new(ArrayValidation {
items: Some(SingleOrVec::Single(Box::new(
gen.subschema_for::<Option<u32>>(),
generator.subschema_for::<Option<u32>>(),
))),
min_items: Some(3),
max_items: Some(3),
Expand Down Expand Up @@ -347,19 +347,19 @@ impl JsonSchema for SagaDagWrapper {
let mut props = schemars::Map::new();
props.insert(
"saga_name".to_string(),
gen.subschema_for::<String>(),
generator.subschema_for::<String>(),
);
props.insert(
"graph".to_string(),
Schema::Object(graph_schema),
);
props.insert(
"start_node".to_string(),
gen.subschema_for::<u32>(),
generator.subschema_for::<u32>(),
);
props.insert(
"end_node".to_string(),
gen.subschema_for::<u32>(),
generator.subschema_for::<u32>(),
);
props
},
Expand Down
16 changes: 8 additions & 8 deletions v-model/src/storage/postgres.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -838,17 +838,17 @@ impl OAuthClientStore for PostgresStore {
));

// Only include secrets that have not been deleted
if let Some(secret) = secret {
if secret.deleted_at.is_none() {
value.1.push(secret.into());
}
if let Some(secret) = secret
&& secret.deleted_at.is_none()
{
value.1.push(secret.into());
}

// Only include redirect URIs that have not been deleted
if let Some(redirect) = redirect {
if redirect.deleted_at.is_none() {
value.2.push(redirect.into());
}
if let Some(redirect) = redirect
&& redirect.deleted_at.is_none()
{
value.2.push(redirect.into());
}

clients
Expand Down
5 changes: 3 additions & 2 deletions xtask/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
[package]
name = "xtask"
version = "0.1.0"
edition = "2021"
version.workspace = true
edition.workspace = true
publish.workspace = true

[dependencies]
clap = { workspace = true }
Expand Down
Loading