Skip to content

Commit 6743de7

Browse files
authored
chore: Update rust to 1.94 (#1015)
1 parent 0f47bf6 commit 6743de7

9 files changed

Lines changed: 13 additions & 10 deletions

File tree

.github/actions/rust-setup/action.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ description: 'Setup Rust toolchain with dependencies, caching, and mold linker'
44
inputs:
55
toolchain:
66
description: 'Rust toolchain version'
7-
default: '1.90.0'
7+
default: '1.94.0'
88
components:
99
description: 'Rust components to install (comma-separated)'
1010
default: ''

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ members = [
4242
[workspace.package]
4343
license = "AGPL-3.0-only"
4444
edition = "2024"
45-
rust-version = "1.90"
45+
rust-version = "1.94"
4646
repository = "https://github.com/meteroid-oss/meteroid"
4747

4848
[workspace.dependencies]

modules/metering/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11

2-
FROM lukemathwalker/cargo-chef:latest-rust-1.90.0-bookworm AS chef
2+
FROM lukemathwalker/cargo-chef:latest-rust-1.94.0-bookworm AS chef
33
ARG CARGO_REGISTRIES_CRATES_IO_PROTOCOL=sparse
44
ENV CARGO_NET_GIT_FETCH_WITH_CLI=true
55
WORKDIR /opt/src

modules/meteroid/api.Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11

2-
FROM lukemathwalker/cargo-chef:latest-rust-1.90.0-bookworm AS chef
2+
FROM lukemathwalker/cargo-chef:latest-rust-1.94.0-bookworm AS chef
33
ARG CARGO_REGISTRIES_CRATES_IO_PROTOCOL=sparse
44
ENV CARGO_NET_GIT_FETCH_WITH_CLI=true
55
WORKDIR /opt/src

modules/meteroid/crates/diesel-models/src/query/invoicing_entities.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ use crate::connectors::ConnectorRow;
1111
use common_domain::ids::{InvoiceId, InvoicingEntityId, TenantId};
1212
use diesel::{
1313
ExpressionMethods, JoinOnDsl, NullableExpressionMethods, QueryDsl, Selectable,
14-
SelectableHelper, alias, debug_query,
14+
SelectableHelper, debug_query,
1515
};
1616
use error_stack::ResultExt;
1717

modules/meteroid/crates/meteroid-store/src/services/lifecycle/period_transitions.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -329,12 +329,12 @@ impl Services {
329329
}
330330

331331
fn activate_subscription(&self, subscription: &SubscriptionRow) -> StoreResult<NextCycle> {
332-
if subscription.trial_duration.is_some() {
332+
if let Some(trial_duration) = subscription.trial_duration {
333333
let new_period_start = subscription
334334
.current_period_end
335335
.unwrap_or_else(|| Utc::now().naive_utc().date());
336336
let new_period_end = new_period_start
337-
.checked_add_days(Days::new(subscription.trial_duration.unwrap() as u64))
337+
.checked_add_days(Days::new(trial_duration as u64))
338338
.unwrap_or_else(|| new_period_start + Duration::days(7));
339339
Ok(NextCycle {
340340
status: SubscriptionStatusEnum::TrialActive,

modules/meteroid/crates/meteroid-store/src/services/orchestration/payment_transaction_settled.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -163,13 +163,13 @@ impl Services {
163163
let mut cycle_index = None;
164164
let status;
165165

166-
if subscription.subscription.trial_duration.is_some() {
166+
if let Some(trial_duration) = subscription.subscription.trial_duration {
167167
status = SubscriptionStatusEnum::TrialActive;
168168
current_period_start = billing_start_date;
169169
current_period_end = Some(
170170
current_period_start
171171
+ chrono::Duration::days(i64::from(
172-
subscription.subscription.trial_duration.unwrap(),
172+
trial_duration,
173173
)),
174174
);
175175
next_cycle_action = Some(CycleActionEnum::EndTrial);

modules/meteroid/scheduler.Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11

2-
FROM lukemathwalker/cargo-chef:latest-rust-1.90.0-bookworm AS chef
2+
FROM lukemathwalker/cargo-chef:latest-rust-1.94.0-bookworm AS chef
33
ARG CARGO_REGISTRIES_CRATES_IO_PROTOCOL=sparse
44
ENV CARGO_NET_GIT_FETCH_WITH_CLI=true
55
WORKDIR /opt/src

rust-toolchain.toml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
[toolchain]
2+
channel = "1.94"
3+
components = ["rustc", "cargo", "rustfmt", "clippy", "rust-std"]

0 commit comments

Comments
 (0)