diff --git a/Cargo.lock b/Cargo.lock index fc5bc50e462..0c75c9498d4 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -113,9 +113,9 @@ dependencies = [ [[package]] name = "actix-web" -version = "4.12.0" +version = "4.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2233f53f6cb18ae038ce1f0713ca0c72ca0c4b71fe9aaeb59924ce2c89c6dd85" +checksum = "1654a77ba142e37f049637a3e5685f864514af11fcbc51cb51eb6596afe5b8d6" dependencies = [ "actix-codec", "actix-http", @@ -845,7 +845,7 @@ dependencies = [ "miniz_oxide", "object 0.37.3", "rustc-demangle", - "windows-link 0.2.1", + "windows-link", ] [[package]] @@ -1047,9 +1047,9 @@ checksum = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5" [[package]] name = "cc" -version = "1.2.47" +version = "1.2.48" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd405d82c84ff7f35739f175f67d8b9fb7687a0e84ccdc78bd3568839827cf07" +checksum = "c481bdbf0ed3b892f6f806287d72acd515b352a4ec27a208489b8c1bc839633a" dependencies = [ "find-msvc-tools", "jobserver", @@ -1080,7 +1080,7 @@ dependencies = [ "num-traits", "serde", "wasm-bindgen", - "windows-link 0.2.1", + "windows-link", ] [[package]] @@ -1979,9 +1979,9 @@ dependencies = [ [[package]] name = "crypto-common" -version = "0.1.6" +version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" +checksum = "78c8292055d1c1df0cce5d180393dc8cce0abec0a7102adb6c7b1eef6016d60a" dependencies = [ "generic-array", "rand_core 0.6.4", @@ -2317,9 +2317,9 @@ dependencies = [ [[package]] name = "diesel_derives" -version = "2.3.4" +version = "2.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9daac6489a36e42570da165a10c424f3edcefdff70c5fd55e1847c23f3dd7562" +checksum = "8587cbca3c929fb198e7950d761d31ca72b80aa6e07c1b7bec5879d187720436" dependencies = [ "diesel_table_macro_syntax", "dsl_auto_type", @@ -2822,9 +2822,9 @@ dependencies = [ [[package]] name = "generic-array" -version = "0.14.9" +version = "0.14.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bb6743198531e02858aeaea5398fcc883e71851fcbcb5a2f773e2fb6cb1edf2" +checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" dependencies = [ "typenum", "version_check", @@ -3107,13 +3107,13 @@ dependencies = [ [[package]] name = "hostname" -version = "0.4.1" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a56f203cd1c76362b69e3863fd987520ac36cf70a8c92627449b2f64a8cf7d65" +checksum = "617aaa3557aef3810a6369d0a99fac8a080891b68bd9f9812a1eeda0c0730cbd" dependencies = [ "cfg-if", "libc", - "windows-link 0.1.3", + "windows-link", ] [[package]] @@ -3653,9 +3653,9 @@ dependencies = [ [[package]] name = "js-sys" -version = "0.3.82" +version = "0.3.83" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b011eec8cc36da2aab2d5cff675ec18454fad408585853910a202391cf9f8e65" +checksum = "464a3709c7f55f1f721e5389aa6ea4e3bc6aba669353300af094b29ffbdde1d8" dependencies = [ "once_cell", "wasm-bindgen", @@ -4562,7 +4562,7 @@ dependencies = [ "libc", "redox_syscall", "smallvec", - "windows-link 0.2.1", + "windows-link", ] [[package]] @@ -5392,9 +5392,9 @@ dependencies = [ [[package]] name = "rustls-pki-types" -version = "1.13.0" +version = "1.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94182ad936a0c91c324cd46c6511b9510ed16af436d7b5bab34beab0afd55f7a" +checksum = "708c0f9d5f54ba0272468c1d306a52c495b31fa155e91bc25371e6df7996908c" dependencies = [ "web-time", "zeroize", @@ -7002,9 +7002,9 @@ checksum = "b8dad83b4f25e74f184f64c43b150b91efe7647395b42289f38e50566d82855b" [[package]] name = "wasm-bindgen" -version = "0.2.105" +version = "0.2.106" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da95793dfc411fbbd93f5be7715b0578ec61fe87cb1a42b12eb625caa5c5ea60" +checksum = "0d759f433fa64a2d763d1340820e46e111a7a5ab75f993d1852d70b03dbb80fd" dependencies = [ "cfg-if", "once_cell", @@ -7015,9 +7015,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-futures" -version = "0.4.55" +version = "0.4.56" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "551f88106c6d5e7ccc7cd9a16f312dd3b5d36ea8b4954304657d5dfba115d4a0" +checksum = "836d9622d604feee9e5de25ac10e3ea5f2d65b41eac0d9ce72eb5deae707ce7c" dependencies = [ "cfg-if", "js-sys", @@ -7028,9 +7028,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.105" +version = "0.2.106" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04264334509e04a7bf8690f2384ef5265f05143a4bff3889ab7a3269adab59c2" +checksum = "48cb0d2638f8baedbc542ed444afc0644a29166f1595371af4fecf8ce1e7eeb3" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -7038,9 +7038,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.105" +version = "0.2.106" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "420bc339d9f322e562942d52e115d57e950d12d88983a14c79b86859ee6c7ebc" +checksum = "cefb59d5cd5f92d9dcf80e4683949f15ca4b511f4ac0a6e14d4e1ac60c6ecd40" dependencies = [ "bumpalo", "proc-macro2", @@ -7051,9 +7051,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-shared" -version = "0.2.105" +version = "0.2.106" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76f218a38c84bcb33c25ec7059b07847d465ce0e0a76b995e134a45adcb6af76" +checksum = "cbc538057e648b67f72a982e708d485b2efa771e1ac05fec311f9f63e5800db4" dependencies = [ "unicode-ident", ] @@ -7073,9 +7073,9 @@ dependencies = [ [[package]] name = "web-sys" -version = "0.3.82" +version = "0.3.83" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a1f95c0d03a47f4ae1f7a64643a6bb97465d9b740f0fa8f90ea33915c99a9a1" +checksum = "9b32828d774c412041098d182a8b38b16ea816958e07cf40eec2bc080ae137ac" dependencies = [ "js-sys", "wasm-bindgen", @@ -7171,7 +7171,7 @@ checksum = "b8e83a14d34d0623b51dce9581199302a221863196a1dde71a7663a4c2be9deb" dependencies = [ "windows-implement", "windows-interface", - "windows-link 0.2.1", + "windows-link", "windows-result", "windows-strings", ] @@ -7198,12 +7198,6 @@ dependencies = [ "syn", ] -[[package]] -name = "windows-link" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e6ad25900d524eaabdbbb96d20b4311e1e7ae1699af4fb28c17ae66c80d798a" - [[package]] name = "windows-link" version = "0.2.1" @@ -7216,7 +7210,7 @@ version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "02752bf7fbdcce7f2a27a742f798510f3e5ad88dbe84871e5168e2120c3d5720" dependencies = [ - "windows-link 0.2.1", + "windows-link", "windows-result", "windows-strings", ] @@ -7227,7 +7221,7 @@ version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7781fa89eaf60850ac3d2da7af8e5242a5ea78d1a11c49bf2910bb5a73853eb5" dependencies = [ - "windows-link 0.2.1", + "windows-link", ] [[package]] @@ -7236,7 +7230,7 @@ version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7837d08f69c77cf6b07689544538e017c1bfcf57e34b4c0ff58e6c2cd3b37091" dependencies = [ - "windows-link 0.2.1", + "windows-link", ] [[package]] @@ -7281,7 +7275,7 @@ version = "0.61.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ae137229bcbd6cdf0f7b80a31df61766145077ddf49416a728b02cb3921ff3fc" dependencies = [ - "windows-link 0.2.1", + "windows-link", ] [[package]] @@ -7321,7 +7315,7 @@ version = "0.53.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4945f9f551b88e0d65f3db0bc25c33b8acea4d9e41163edf90dcd0b19f9069f3" dependencies = [ - "windows-link 0.2.1", + "windows-link", "windows_aarch64_gnullvm 0.53.1", "windows_aarch64_msvc 0.53.1", "windows_i686_gnu 0.53.1", @@ -7472,9 +7466,9 @@ checksum = "d6bbff5f0aada427a1e5a6da5f1f98158182f26556f345ac9e04d36d0ebed650" [[package]] name = "winnow" -version = "0.7.13" +version = "0.7.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21a0236b59786fed61e2a80582dd500fe61f18b5dca67a4a067d0bc9039339cf" +checksum = "5a5364e9d77fcdeeaa6062ced926ee3381faa2ee02d3eb83a5c27a8825540829" dependencies = [ "memchr", ] @@ -7532,18 +7526,18 @@ dependencies = [ [[package]] name = "zerocopy" -version = "0.8.28" +version = "0.8.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43fa6694ed34d6e57407afbccdeecfa268c470a7d2a5b0cf49ce9fcc345afb90" +checksum = "fd74ec98b9250adb3ca554bdde269adf631549f51d8a8f8f0a10b50f1cb298c3" dependencies = [ "zerocopy-derive", ] [[package]] name = "zerocopy-derive" -version = "0.8.28" +version = "0.8.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c640b22cd9817fae95be82f0d2f90b11f7605f6c319d16705c459b27ac2cbc26" +checksum = "d8a8d209fdf45cf5138cbb5a506f6b52522a25afccc534d1475dad8e31105c6a" dependencies = [ "proc-macro2", "quote", diff --git a/crates/crates_io_database/src/utils/token.rs b/crates/crates_io_database/src/utils/token.rs index d7a62680f4d..6bd37934eef 100644 --- a/crates/crates_io_database/src/utils/token.rs +++ b/crates/crates_io_database/src/utils/token.rs @@ -37,7 +37,6 @@ impl HashedToken { } pub fn hash(plaintext: &str) -> Vec { - #[expect(deprecated)] Sha256::digest(plaintext.as_bytes()).as_slice().to_vec() } } @@ -99,7 +98,6 @@ mod tests { use googletest::prelude::*; #[test] - #[expect(deprecated)] fn test_generated_and_parse() { let token = PlainToken::generate(); assert_that!(token.expose_secret(), starts_with(TOKEN_PREFIX)); diff --git a/crates/crates_io_trustpub/src/access_token.rs b/crates/crates_io_trustpub/src/access_token.rs index c1a7c2c9625..46b2877e348 100644 --- a/crates/crates_io_trustpub/src/access_token.rs +++ b/crates/crates_io_trustpub/src/access_token.rs @@ -124,7 +124,6 @@ mod tests { } #[test] - #[expect(deprecated)] fn test_sha256() { let token = AccessToken(SecretString::from(EXAMPLE_TOKEN)); let hash = token.sha256(); diff --git a/src/controllers/github/secret_scanning.rs b/src/controllers/github/secret_scanning.rs index 03ffddb1645..450307dc7db 100644 --- a/src/controllers/github/secret_scanning.rs +++ b/src/controllers/github/secret_scanning.rs @@ -145,7 +145,6 @@ async fn alert_revoke_token( let hashed_token = token.sha256(); // Delete the token and return crate_ids for notifications - #[expect(deprecated)] let crate_ids = diesel::delete(trustpub_tokens::table) .filter(trustpub_tokens::hashed_token.eq(hashed_token.as_slice())) .returning(trustpub_tokens::crate_ids) diff --git a/src/controllers/krate/publish.rs b/src/controllers/krate/publish.rs index fe2201c7c7b..f9968883438 100644 --- a/src/controllers/krate/publish.rs +++ b/src/controllers/krate/publish.rs @@ -183,7 +183,6 @@ pub async fn publish(app: AppState, req: Parts, body: Body) -> AppResult>, Option) = trustpub_tokens::table .filter(trustpub_tokens::hashed_token.eq(hashed_token.as_slice())) diff --git a/src/controllers/trustpub/tokens/revoke/mod.rs b/src/controllers/trustpub/tokens/revoke/mod.rs index 2bf79a540fd..c69a3a02342 100644 --- a/src/controllers/trustpub/tokens/revoke/mod.rs +++ b/src/controllers/trustpub/tokens/revoke/mod.rs @@ -30,7 +30,6 @@ pub async fn revoke_trustpub_token(app: AppState, auth: AuthHeader) -> AppResult let mut conn = app.db_write().await?; - #[expect(deprecated)] diesel::delete(trustpub_tokens::table) .filter(trustpub_tokens::hashed_token.eq(hashed_token.as_slice())) .execute(&mut conn) diff --git a/src/tests/krate/publish/trustpub_github.rs b/src/tests/krate/publish/trustpub_github.rs index 50b4020c079..34f389cc481 100644 --- a/src/tests/krate/publish/trustpub_github.rs +++ b/src/tests/krate/publish/trustpub_github.rs @@ -162,7 +162,6 @@ fn generate_token() -> (String, Output) { (token.finalize().expose_secret().to_string(), token.sha256()) } -#[expect(deprecated)] async fn new_token(conn: &mut AsyncPgConnection, crate_id: i32) -> QueryResult { let (token, hashed_token) = generate_token(); diff --git a/src/tests/krate/publish/trustpub_gitlab.rs b/src/tests/krate/publish/trustpub_gitlab.rs index 27c80478ba6..abf972942d3 100644 --- a/src/tests/krate/publish/trustpub_gitlab.rs +++ b/src/tests/krate/publish/trustpub_gitlab.rs @@ -143,7 +143,6 @@ fn generate_token() -> (String, Output) { (token.finalize().expose_secret().to_string(), token.sha256()) } -#[expect(deprecated)] async fn new_token(conn: &mut AsyncPgConnection, crate_id: i32) -> QueryResult { let (token, hashed_token) = generate_token(); diff --git a/src/tests/routes/trustpub/tokens/exchange/github.rs b/src/tests/routes/trustpub/tokens/exchange/github.rs index 3ec8d1a6426..6edc4be1736 100644 --- a/src/tests/routes/trustpub/tokens/exchange/github.rs +++ b/src/tests/routes/trustpub/tokens/exchange/github.rs @@ -93,7 +93,6 @@ async fn test_happy_path() -> anyhow::Result<()> { let mut conn = client.app().db_conn().await; - #[expect(deprecated)] let tokens = trustpub_tokens::table .filter(trustpub_tokens::hashed_token.eq(hashed_token.as_slice())) .select((trustpub_tokens::id, trustpub_tokens::crate_ids)) diff --git a/src/tests/routes/trustpub/tokens/exchange/gitlab.rs b/src/tests/routes/trustpub/tokens/exchange/gitlab.rs index ee32b1e2a6c..e0367f309f0 100644 --- a/src/tests/routes/trustpub/tokens/exchange/gitlab.rs +++ b/src/tests/routes/trustpub/tokens/exchange/gitlab.rs @@ -92,7 +92,6 @@ async fn test_happy_path() -> anyhow::Result<()> { let mut conn = client.app().db_conn().await; - #[expect(deprecated)] let tokens = trustpub_tokens::table .filter(trustpub_tokens::hashed_token.eq(hashed_token.as_slice())) .select((trustpub_tokens::id, trustpub_tokens::crate_ids)) diff --git a/src/tests/routes/trustpub/tokens/revoke.rs b/src/tests/routes/trustpub/tokens/revoke.rs index 557d2c844cc..ea24a3238d2 100644 --- a/src/tests/routes/trustpub/tokens/revoke.rs +++ b/src/tests/routes/trustpub/tokens/revoke.rs @@ -18,7 +18,6 @@ fn generate_token() -> (String, Output) { (token.finalize().expose_secret().to_string(), token.sha256()) } -#[expect(deprecated)] async fn new_token(conn: &mut AsyncPgConnection, crate_id: i32) -> QueryResult { let (token, hashed_token) = generate_token(); diff --git a/src/util/gh_token_encryption.rs b/src/util/gh_token_encryption.rs index c8d45caf309..7de79dc4a55 100644 --- a/src/util/gh_token_encryption.rs +++ b/src/util/gh_token_encryption.rs @@ -9,7 +9,6 @@ pub struct GitHubTokenEncryption { cipher: Aes256Gcm, } -#[expect(deprecated)] impl GitHubTokenEncryption { /// Creates a new [GitHubTokenEncryption] instance with the provided cipher pub fn new(cipher: Aes256Gcm) -> Self { @@ -92,7 +91,6 @@ impl GitHubTokenEncryption { } #[cfg(test)] -#[expect(deprecated)] mod tests { use super::*; use aes_gcm::{Key, KeyInit};