From e2995fd223b47113c8fc6d2f50896b456bf869b7 Mon Sep 17 00:00:00 2001 From: phoenix Date: Sun, 3 May 2026 17:41:40 -0400 Subject: [PATCH] Update rust (#93) Reviewed-on: https://git.kundeng.us/phoenix/icarus_models/pulls/93 Co-authored-by: phoenix Co-committed-by: phoenix --- .gitea/workflows/tag_release.yaml | 2 +- .gitea/workflows/workflow.yaml | 10 +-- .gitlab-ci.yml | 31 +-------- Cargo.lock | 104 ++++++++++-------------------- Cargo.toml | 14 ++-- src/coverart.rs | 2 +- src/song.rs | 2 +- 7 files changed, 51 insertions(+), 114 deletions(-) diff --git a/.gitea/workflows/tag_release.yaml b/.gitea/workflows/tag_release.yaml index d6bafa0..220e516 100644 --- a/.gitea/workflows/tag_release.yaml +++ b/.gitea/workflows/tag_release.yaml @@ -20,7 +20,7 @@ jobs: - name: Install Rust uses: actions-rs/toolchain@v1 with: - toolchain: 1.94 + toolchain: 1.95 components: cargo - name: Extract Version from Cargo.toml diff --git a/.gitea/workflows/workflow.yaml b/.gitea/workflows/workflow.yaml index 85ca80e..d82ba9a 100644 --- a/.gitea/workflows/workflow.yaml +++ b/.gitea/workflows/workflow.yaml @@ -16,7 +16,7 @@ jobs: - uses: actions/checkout@v5 - uses: actions-rust-lang/setup-rust-toolchain@v1 with: - toolchain: 1.94 + toolchain: 1.95 - run: cargo check test: @@ -26,7 +26,7 @@ jobs: - uses: actions/checkout@v5 - uses: actions-rust-lang/setup-rust-toolchain@v1 with: - toolchain: 1.94 + toolchain: 1.95 - run: cargo test fmt: @@ -36,7 +36,7 @@ jobs: - uses: actions/checkout@v5 - uses: actions-rust-lang/setup-rust-toolchain@v1 with: - toolchain: 1.94 + toolchain: 1.95 - run: rustup component add rustfmt - run: cargo fmt --all -- --check @@ -47,7 +47,7 @@ jobs: - uses: actions/checkout@v5 - uses: actions-rust-lang/setup-rust-toolchain@v1 with: - toolchain: 1.94 + toolchain: 1.95 - run: rustup component add clippy - run: cargo clippy -- -D warnings @@ -58,5 +58,5 @@ jobs: - uses: actions/checkout@v5 - uses: actions-rust-lang/setup-rust-toolchain@v1 with: - toolchain: 1.94 + toolchain: 1.95 - run: cargo build diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 0d8531d..e326a22 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -6,7 +6,7 @@ stages: build: stage: build - image: rust:1.85 + image: rust:1.95 script: - cargo build --release - ls -R target/release/ @@ -22,7 +22,7 @@ build: test: stage: test - image: rust:1.85 + image: rust:1.95 script: - cargo test cache: @@ -33,7 +33,7 @@ test: test_variable: stage: test - image: rust:1.85 + image: rust:1.95 script: - echo "Checking CARGO_LOGIN_TOKEN..." - if [[ -z "$CARGO_LOGIN_TOKEN" ]]; then echo "CARGO_LOGIN_TOKEN is empty!"; exit 1; else echo "CARGO_LOGIN_TOKEN is set."; fi @@ -56,28 +56,3 @@ extract_version: artifacts: reports: dotenv: version.env - -tag_release: - stage: deploy - image: registry.gitlab.com/gitlab-org/release-cli:latest - rules: - - if: '($CI_COMMIT_BRANCH == "dev" || $CI_COMMIT_BRANCH == "main") && $CI_PIPELINE_SOURCE == "push"' - dependencies: - - extract_version - script: - - release-cli create --name "Release $CI_COMMIT_BRANCH-v$VERSION" --tag-name "$CI_COMMIT_BRANCH-v$VERSION" - -deploy: - stage: deploy - image: rust:1.85 - script: - - echo "Deployment will be configured when this is ready for use" - # - env - # Uncomment when you are ready for this to be published - # - cargo login "$CARGO_LOGIN_TOKEN" - # - cargo publish - dependencies: - - build - rules: - - if: '$CI_COMMIT_TAG' - diff --git a/Cargo.lock b/Cargo.lock index a47dc48..ecca0c9 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -57,6 +57,26 @@ version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9330f8b2ff13f34540b44e946ef35111825727b38d33286ef986142615121801" +[[package]] +name = "chacha20" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6f8d983286843e49675a4b7a2d174efe136dc93a18d69130dd18198a6c167601" +dependencies = [ + "cfg-if", + "cpufeatures", + "rand_core", +] + +[[package]] +name = "cpufeatures" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b2a41393f66f16b0823bb79094d54ac5fbd34ab292ddafb9a0456ac9f87d201" +dependencies = [ + "libc", +] + [[package]] name = "crc32fast" version = "1.5.0" @@ -135,18 +155,6 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" -[[package]] -name = "getrandom" -version = "0.3.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "899def5c37c4fd7b2664648c28120ecec138e4d395b459e5ca34f9cce2dd77fd" -dependencies = [ - "cfg-if", - "libc", - "r-efi 5.3.0", - "wasip2", -] - [[package]] name = "getrandom" version = "0.4.2" @@ -155,7 +163,8 @@ checksum = "0de51e6874e94e7bf76d726fc5d13ba782deca734ff60d5bb2fb2607c7406555" dependencies = [ "cfg-if", "libc", - "r-efi 6.0.0", + "r-efi", + "rand_core", "wasip2", "wasip3", ] @@ -183,7 +192,7 @@ checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" [[package]] name = "icarus_models" -version = "0.10.0" +version = "0.11.0" dependencies = [ "josekit", "rand", @@ -348,15 +357,6 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" -[[package]] -name = "ppv-lite86" -version = "0.2.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85eae3c4ed2f50dcfe72643da4befc30deadb458a9b590d720cde2f2b1e97da9" -dependencies = [ - "zerocopy", -] - [[package]] name = "prettyplease" version = "0.2.37" @@ -385,12 +385,6 @@ dependencies = [ "proc-macro2", ] -[[package]] -name = "r-efi" -version = "5.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69cdb34c158ceb288df11e18b4bd39de994f6657d83847bdffdbd7f346754b0f" - [[package]] name = "r-efi" version = "6.0.0" @@ -399,32 +393,20 @@ checksum = "f8dcc9c7d52a811697d2151c701e0d08956f92b0e24136cf4cf27b57a6a0d9bf" [[package]] name = "rand" -version = "0.9.2" +version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6db2770f06117d490610c7488547d543617b21bfa07796d7a12f6f1bd53850d1" +checksum = "d2e8e8bcc7961af1fdac401278c6a831614941f6164ee3bf4ce61b7edb162207" dependencies = [ - "rand_chacha", - "rand_core", -] - -[[package]] -name = "rand_chacha" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3022b5f1df60f26e1ffddd6c66e8aa15de382ae63b3a0c1bfc0e4d3e3f325cb" -dependencies = [ - "ppv-lite86", + "chacha20", + "getrandom", "rand_core", ] [[package]] name = "rand_core" -version = "0.9.5" +version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76afc826de14238e6e8c374ddcc1fa19e374fd8dd986b0d2af0d02377261d83c" -dependencies = [ - "getrandom 0.3.4", -] +checksum = "63b8176103e19a2643978565ca18b50549f6101881c443590420e4dc998a3c69" [[package]] name = "regex" @@ -554,7 +536,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "32497e9a4c7b38532efcdebeef879707aa9f794296a4f0244f6f69e9bc8574bd" dependencies = [ "fastrand", - "getrandom 0.4.2", + "getrandom", "once_cell", "rustix", "windows-sys", @@ -649,11 +631,11 @@ dependencies = [ [[package]] name = "uuid" -version = "1.22.0" +version = "1.23.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a68d3c8f01c0cfa54a75291d83601161799e4a89a39e0929f4b0354d88757a37" +checksum = "ddd74a9687298c6858e9b88ec8935ec45d22e8fd5e6394fa1bd4e99a87789c76" dependencies = [ - "getrandom 0.4.2", + "getrandom", "js-sys", "serde_core", "wasm-bindgen", @@ -865,26 +847,6 @@ dependencies = [ "wasmparser", ] -[[package]] -name = "zerocopy" -version = "0.8.47" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "efbb2a062be311f2ba113ce66f697a4dc589f85e78a4aea276200804cea0ed87" -dependencies = [ - "zerocopy-derive", -] - -[[package]] -name = "zerocopy-derive" -version = "0.8.47" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e8bc7269b54418e7aeeef514aa68f8690b8c0489a06b0136e5f57c4c5ccab89" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - [[package]] name = "zmij" version = "1.0.21" diff --git a/Cargo.toml b/Cargo.toml index c88c0f3..855a27a 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,19 +1,19 @@ [package] name = "icarus_models" -version = "0.10.0" +version = "0.11.0" edition = "2024" -rust-version = "1.94" +rust-version = "1.95" description = "models used for the icarus project" license = "MIT" [dependencies] serde = { version = "1.0.228", features = ["derive"] } -serde_json = { version = "1.0.145" } -rand = { version = "0.9.2" } -time = { version = "0.3.44", features = ["formatting", "macros", "parsing", "serde"] } -uuid = { version = "1.18.1", features = ["v4", "serde"] } +serde_json = { version = "1.0.149" } +rand = { version = "0.10.1" } +time = { version = "0.3.47", features = ["formatting", "macros", "parsing", "serde"] } +uuid = { version = "1.23.1", features = ["v4", "serde"] } josekit = { version = "0.10.3" } utoipa = { version = "5.4.0", features = ["uuid", "time"] } [dev-dependencies] -tempfile = { version = "3.23.0" } +tempfile = { version = "3.27.0" } diff --git a/src/coverart.rs b/src/coverart.rs index a696862..0305032 100644 --- a/src/coverart.rs +++ b/src/coverart.rs @@ -1,6 +1,6 @@ use std::io::Write; -use rand::Rng; +use rand::RngExt; const FILENAME_LENGTH: i32 = 16; diff --git a/src/song.rs b/src/song.rs index fb1c1a4..290b20a 100644 --- a/src/song.rs +++ b/src/song.rs @@ -1,6 +1,6 @@ use std::io::Write; -use rand::Rng; +use rand::RngExt; use serde::{Deserialize, Serialize}; use crate::constants;