Skip to content

Commit 2dced25

Browse files
committed
fix: Apply cargo fmt and update CI for Node.js deprecation
- Run cargo fmt to fix formatting across cli, core, and web crates - Update actions/checkout from v4 to v5 to resolve Node.js 20 deprecation - Update CI workflow trigger from master to main
1 parent 4ddec30 commit 2dced25

7 files changed

Lines changed: 44 additions & 38 deletions

File tree

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
name: Check
1515
runs-on: ubuntu-latest
1616
steps:
17-
- uses: actions/checkout@v4
17+
- uses: actions/checkout@v5
1818

1919
- uses: dtolnay/rust-toolchain@stable
2020
with:

.github/workflows/release.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
name: Docker Image
1919
runs-on: ubuntu-latest
2020
steps:
21-
- uses: actions/checkout@v4
21+
- uses: actions/checkout@v5
2222

2323
- name: Log in to GHCR
2424
uses: docker/login-action@v3
@@ -58,7 +58,7 @@ jobs:
5858
os: macos-latest
5959
artifact: aliasman-aarch64-macos.tar.gz
6060
steps:
61-
- uses: actions/checkout@v4
61+
- uses: actions/checkout@v5
6262

6363
- uses: dtolnay/rust-toolchain@stable
6464
with:

crates/aliasman-cli/src/commands/alias.rs

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -209,16 +209,19 @@ pub async fn handle(
209209
);
210210
}
211211
if let Some(ref desc) = description {
212-
println!(
213-
" description: {:?} -> {:?}",
214-
existing.description, desc
215-
);
212+
println!(" description: {:?} -> {:?}", existing.description, desc);
216213
}
217214
} else {
218215
storage.open(false).await?;
219-
let result =
220-
edit_alias(storage, email, alias, domain, new_addresses, description.clone())
221-
.await;
216+
let result = edit_alias(
217+
storage,
218+
email,
219+
alias,
220+
domain,
221+
new_addresses,
222+
description.clone(),
223+
)
224+
.await;
222225
let close_result = storage.close().await;
223226
let updated = result?;
224227
close_result?;

crates/aliasman-cli/src/commands/audit.rs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,7 @@ pub async fn handle(
2929

3030
for diff in &result.diffs {
3131
match diff {
32-
AuditDiff::StorageOnly {
33-
alias, domain, ..
34-
} => {
32+
AuditDiff::StorageOnly { alias, domain, .. } => {
3533
println!(" MISSING FROM EMAIL {}@{}", alias, domain);
3634
println!(" Active in storage but not found on email provider");
3735
}

crates/aliasman-core/src/lib.rs

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -118,10 +118,13 @@ pub async fn edit_alias(
118118
new_addresses: Option<Vec<String>>,
119119
new_description: Option<String>,
120120
) -> Result<Alias> {
121-
let mut existing = storage.get(alias, domain).await?.ok_or_else(|| Error::AliasNotFound {
122-
alias: alias.to_string(),
123-
domain: domain.to_string(),
124-
})?;
121+
let mut existing = storage
122+
.get(alias, domain)
123+
.await?
124+
.ok_or_else(|| Error::AliasNotFound {
125+
alias: alias.to_string(),
126+
domain: domain.to_string(),
127+
})?;
125128

126129
let addresses_changed = new_addresses
127130
.as_ref()

crates/aliasman-web/src/routes.rs

Lines changed: 22 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ use axum::{Form, Router};
77
use rust_embed::Embed;
88
use serde::Deserialize;
99

10-
use aliasman_core::model::{Alias, AliasFilter};
1110
use aliasman_core::build_alias;
11+
use aliasman_core::model::{Alias, AliasFilter};
1212

1313
use crate::error::AppError;
1414
use crate::state::SharedState;
@@ -160,8 +160,14 @@ pub fn router(state: SharedState) -> Router {
160160
Router::new()
161161
.route("/", get(index_handler))
162162
.route("/aliases", get(aliases_handler))
163-
.route("/aliases/create", get(create_form_handler).post(create_alias_handler))
164-
.route("/aliases/edit", get(edit_form_handler).post(edit_alias_handler))
163+
.route(
164+
"/aliases/create",
165+
get(create_form_handler).post(create_alias_handler),
166+
)
167+
.route(
168+
"/aliases/edit",
169+
get(edit_form_handler).post(edit_alias_handler),
170+
)
165171
.route("/aliases/delete", post(delete_alias_handler))
166172
.route("/aliases/suspend", post(suspend_alias_handler))
167173
.route("/aliases/unsuspend", post(unsuspend_alias_handler))
@@ -275,9 +281,7 @@ async fn refresh_handler(
275281
})?))
276282
}
277283

278-
async fn create_form_handler(
279-
State(state): State<SharedState>,
280-
) -> Result<Html<String>, AppError> {
284+
async fn create_form_handler(State(state): State<SharedState>) -> Result<Html<String>, AppError> {
281285
let default_domain = state.active_default_domain().await.unwrap_or_default();
282286
let default_addresses = state
283287
.active_default_addresses()
@@ -319,16 +323,15 @@ async fn create_alias_handler(
319323
};
320324

321325
let template = CreateResultTemplate { success, message };
322-
let html = template.render().map_err(|e| {
323-
AppError::Internal(format!("template render error: {}", e))
324-
})?;
326+
let html = template
327+
.render()
328+
.map_err(|e| AppError::Internal(format!("template render error: {}", e)))?;
325329

326330
let mut response = Html(html).into_response();
327331
if success {
328-
response.headers_mut().insert(
329-
"HX-Trigger",
330-
"alias-changed".parse().unwrap(),
331-
);
332+
response
333+
.headers_mut()
334+
.insert("HX-Trigger", "alias-changed".parse().unwrap());
332335
}
333336
Ok(response)
334337
}
@@ -424,16 +427,15 @@ fn alias_action_response(
424427
};
425428

426429
let template = ActionResultTemplate { success, message };
427-
let html = template.render().map_err(|e| {
428-
AppError::Internal(format!("template render error: {}", e))
429-
})?;
430+
let html = template
431+
.render()
432+
.map_err(|e| AppError::Internal(format!("template render error: {}", e)))?;
430433

431434
let mut response = Html(html).into_response();
432435
if success {
433-
response.headers_mut().insert(
434-
"HX-Trigger",
435-
"alias-changed".parse().unwrap(),
436-
);
436+
response
437+
.headers_mut()
438+
.insert("HX-Trigger", "alias-changed".parse().unwrap());
437439
}
438440
Ok(response)
439441
}

crates/aliasman-web/src/state.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@ use std::sync::Arc;
33
use tokio::sync::RwLock;
44

55
use aliasman_core::config::AppConfig;
6-
use aliasman_core::{create_email_provider, create_storage_provider};
76
use aliasman_core::error::Result as CoreResult;
87
use aliasman_core::model::{Alias, AliasFilter};
98
use aliasman_core::storage::StorageProvider;
9+
use aliasman_core::{create_email_provider, create_storage_provider};
1010

1111
pub type SharedState = Arc<AppState>;
1212

0 commit comments

Comments
 (0)