Skip to content

Commit 8288113

Browse files
authored
Merge pull request #12427 from rust-lang/renovate/rust-lock-file-maintenance
Lock file maintenance (Rust)
2 parents 3af150f + 7b2475e commit 8288113

File tree

12 files changed

+44
-63
lines changed

12 files changed

+44
-63
lines changed

Cargo.lock

Lines changed: 44 additions & 50 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

crates/crates_io_database/src/utils/token.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@ impl HashedToken {
3737
}
3838

3939
pub fn hash(plaintext: &str) -> Vec<u8> {
40-
#[expect(deprecated)]
4140
Sha256::digest(plaintext.as_bytes()).as_slice().to_vec()
4241
}
4342
}
@@ -99,7 +98,6 @@ mod tests {
9998
use googletest::prelude::*;
10099

101100
#[test]
102-
#[expect(deprecated)]
103101
fn test_generated_and_parse() {
104102
let token = PlainToken::generate();
105103
assert_that!(token.expose_secret(), starts_with(TOKEN_PREFIX));

crates/crates_io_trustpub/src/access_token.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,6 @@ mod tests {
124124
}
125125

126126
#[test]
127-
#[expect(deprecated)]
128127
fn test_sha256() {
129128
let token = AccessToken(SecretString::from(EXAMPLE_TOKEN));
130129
let hash = token.sha256();

src/controllers/github/secret_scanning.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,6 @@ async fn alert_revoke_token(
145145
let hashed_token = token.sha256();
146146

147147
// Delete the token and return crate_ids for notifications
148-
#[expect(deprecated)]
149148
let crate_ids = diesel::delete(trustpub_tokens::table)
150149
.filter(trustpub_tokens::hashed_token.eq(hashed_token.as_slice()))
151150
.returning(trustpub_tokens::crate_ids)

src/controllers/krate/publish.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,6 @@ pub async fn publish(app: AppState, req: Parts, body: Body) -> AppResult<Json<Go
183183

184184
let hashed_token = trustpub_token.sha256();
185185

186-
#[expect(deprecated)]
187186
let (crate_ids, trustpub_data): (Vec<Option<i32>>, Option<TrustpubData>) =
188187
trustpub_tokens::table
189188
.filter(trustpub_tokens::hashed_token.eq(hashed_token.as_slice()))

src/controllers/trustpub/tokens/revoke/mod.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ pub async fn revoke_trustpub_token(app: AppState, auth: AuthHeader) -> AppResult
3030

3131
let mut conn = app.db_write().await?;
3232

33-
#[expect(deprecated)]
3433
diesel::delete(trustpub_tokens::table)
3534
.filter(trustpub_tokens::hashed_token.eq(hashed_token.as_slice()))
3635
.execute(&mut conn)

src/tests/krate/publish/trustpub_github.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,6 @@ fn generate_token() -> (String, Output<Sha256>) {
162162
(token.finalize().expose_secret().to_string(), token.sha256())
163163
}
164164

165-
#[expect(deprecated)]
166165
async fn new_token(conn: &mut AsyncPgConnection, crate_id: i32) -> QueryResult<String> {
167166
let (token, hashed_token) = generate_token();
168167

src/tests/krate/publish/trustpub_gitlab.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,6 @@ fn generate_token() -> (String, Output<Sha256>) {
143143
(token.finalize().expose_secret().to_string(), token.sha256())
144144
}
145145

146-
#[expect(deprecated)]
147146
async fn new_token(conn: &mut AsyncPgConnection, crate_id: i32) -> QueryResult<String> {
148147
let (token, hashed_token) = generate_token();
149148

src/tests/routes/trustpub/tokens/exchange/github.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,6 @@ async fn test_happy_path() -> anyhow::Result<()> {
9393

9494
let mut conn = client.app().db_conn().await;
9595

96-
#[expect(deprecated)]
9796
let tokens = trustpub_tokens::table
9897
.filter(trustpub_tokens::hashed_token.eq(hashed_token.as_slice()))
9998
.select((trustpub_tokens::id, trustpub_tokens::crate_ids))

src/tests/routes/trustpub/tokens/exchange/gitlab.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,6 @@ async fn test_happy_path() -> anyhow::Result<()> {
9292

9393
let mut conn = client.app().db_conn().await;
9494

95-
#[expect(deprecated)]
9695
let tokens = trustpub_tokens::table
9796
.filter(trustpub_tokens::hashed_token.eq(hashed_token.as_slice()))
9897
.select((trustpub_tokens::id, trustpub_tokens::crate_ids))

0 commit comments

Comments
 (0)