Skip to content

Commit

Permalink
Update Rust version
Browse files Browse the repository at this point in the history
  • Loading branch information
Celeo committed Feb 20, 2025
1 parent 43994a6 commit a1584cc
Show file tree
Hide file tree
Showing 6 changed files with 29 additions and 21 deletions.
8 changes: 4 additions & 4 deletions Cargo.lock

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

12 changes: 10 additions & 2 deletions vzdv-bot/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,15 @@
[package]
name = "vzdv-bot"
version = "1.3.0"
edition = "2021"
version = "1.4.0"
authors = ["Celeo <[email protected]>"]
edition = "2024"
description = "VATSIM ZDV Discord bot"
readme = "../README.md"
homepage = "https://github.com/Celeo/vzdv"
repository = "https://github.com/Celeo/vzdv"
documentation = "https://github.com/Celeo/vzdv"
license = "MIT OR Apache-2.0"
publish = false

[dependencies]
vzdv = { path = "../vzdv" }
Expand Down
4 changes: 2 additions & 2 deletions vzdv-site/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
[package]
name = "vzdv-site"
version = "1.3.0"
version = "1.4.0"
authors = ["Celeo <[email protected]>"]
edition = "2021"
edition = "2024"
description = "VATSIM ZDV website"
readme = "../README.md"
homepage = "https://github.com/Celeo/vzdv"
Expand Down
18 changes: 9 additions & 9 deletions vzdv-site/src/endpoints/controller.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,15 @@ use crate::{
email::{self, send_mail, send_mail_raw},
flashed_messages::{self, MessageLevel},
shared::{
js_timestamp_to_utc, post_audit, record_log, reject_if_not_in, strip_some_tags, AppError,
AppState, UserInfo, SESSION_USER_INFO_KEY,
AppError, AppState, SESSION_USER_INFO_KEY, UserInfo, js_timestamp_to_utc, post_audit,
record_log, reject_if_not_in, strip_some_tags,
},
};
use axum::{
Form, Router,
extract::{Path, State},
response::{Html, IntoResponse, Redirect, Response},
routing::{delete, get, post},
Form, Router,
};
use chrono::{DateTime, NaiveDateTime, Utc};
use itertools::Itertools;
Expand All @@ -27,14 +27,14 @@ use std::{
};
use tower_sessions::Session;
use vzdv::{
controller_can_see, get_controller_cids_and_names, retrieve_all_in_use_ois,
ControllerRating, PermissionsGroup, StaffPosition, controller_can_see,
get_controller_cids_and_names, retrieve_all_in_use_ois,
sql::{self, Certification, Controller, Feedback, SoloCert, StaffNote},
vatsim,
vatusa::{
self, get_multiple_controller_names, get_training_records, save_training_record,
NewTrainingRecord, TrainingRecord,
self, NewTrainingRecord, TrainingRecord, get_multiple_controller_names,
get_training_records, save_training_record,
},
ControllerRating, PermissionsGroup, StaffPosition,
};

/// Roles the current user is able to set.
Expand All @@ -43,7 +43,7 @@ async fn roles_to_set(
user_info: &Option<UserInfo>,
) -> Result<HashSet<String>, AppError> {
let controller: Option<Controller> = match user_info {
Some(ref ui) => {
Some(ui) => {
sqlx::query_as(sql::GET_CONTROLLER_BY_CID)
.bind(ui.cid)
.fetch_optional(db)
Expand Down Expand Up @@ -213,7 +213,7 @@ async fn page_controller(
by: all_controllers
.iter()
.find(|c| *c.0 == note.by)
.map(|c| format!("{} {} ({})", c.1 .0, c.1 .1, c.0))
.map(|c| format!("{} {} ({})", c.1.0, c.1.1, c.0))
.unwrap_or_else(|| format!("{}?", note.cid)),
by_cid: note.by,
date: note.date,
Expand Down
4 changes: 2 additions & 2 deletions vzdv-tasks/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
[package]
name = "vzdv-tasks"
version = "1.3.0"
version = "1.4.0"
authors = ["Celeo <[email protected]>"]
edition = "2021"
edition = "2024"
description = "VATSIM ZDV task runner"
readme = "../README.md"
homepage = "https://github.com/Celeo/vzdv"
Expand Down
4 changes: 2 additions & 2 deletions vzdv/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[package]
name = "vzdv"
version = "1.3.0"
edition = "2021"
version = "1.4.0"
edition = "2024"
authors = ["Celeo <[email protected]>"]
description = "VATSIM ZDV site core"
readme = "../README.md"
Expand Down

0 comments on commit a1584cc

Please sign in to comment.