Skip to content

Commit dbf9efb

Browse files
authored
Merge pull request #11449 from Turbo87/macro-use
Replace `#[macro_use]` with explicit imports
2 parents c910294 + 3c15b85 commit dbf9efb

File tree

124 files changed

+194
-56
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

124 files changed

+194
-56
lines changed

src/app.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ use diesel_async::pooled_connection::AsyncDieselConnectionManager;
2121
use diesel_async::pooled_connection::deadpool::Pool as DeadpoolPool;
2222
use oauth2::basic::BasicClient;
2323
use oauth2::{EndpointNotSet, EndpointSet};
24+
use tracing::{instrument, warn};
2425

2526
type DeadpoolResult = Result<
2627
diesel_async::pooled_connection::deadpool::Object<AsyncPgConnection>,

src/auth.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ use diesel_async::AsyncPgConnection;
1515
use http::request::Parts;
1616
use http::{StatusCode, header};
1717
use secrecy::{ExposeSecret, SecretString};
18+
use tracing::instrument;
1819

1920
pub struct AuthHeader(SecretString);
2021

src/cloudfront.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ use aws_sdk_cloudfront::config::retry::RetryConfig;
33
use aws_sdk_cloudfront::config::{BehaviorVersion, Region};
44
use aws_sdk_cloudfront::types::{InvalidationBatch, Paths};
55
use aws_sdk_cloudfront::{Client, Config};
6+
use tracing::{debug, instrument, warn};
67

78
pub struct CloudFront {
89
client: Client,

src/config/cdn_log_queue.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
use crates_io_env_vars::{required_var, var};
22
use secrecy::SecretString;
3+
use tracing::warn;
34

45
#[derive(Debug, Clone)]
56
pub enum CdnLogQueueConfig {

src/config/cdn_log_storage.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ use anyhow::Context;
22
use crates_io_env_vars::{required_var, var};
33
use secrecy::SecretString;
44
use std::path::PathBuf;
5+
use tracing::{info, warn};
56

67
#[derive(Debug, Clone)]
78
pub enum CdnLogStorageConfig {

src/config/server.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -329,6 +329,7 @@ impl FromStr for AllowedOrigins {
329329
#[cfg(test)]
330330
mod tests {
331331
use super::*;
332+
use claims::{assert_err, assert_none, assert_ok_eq};
332333

333334
#[test]
334335
fn parse_traffic_patterns_splits_on_comma_and_looks_for_equal_sign() {

src/controllers/category.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,11 @@ use crate::util::errors::AppResult;
66
use crate::views::EncodableCategory;
77
use axum::Json;
88
use axum::extract::{FromRequestParts, Path, Query};
9-
use diesel::QueryDsl;
9+
use diesel::prelude::*;
1010
use diesel_async::RunQueryDsl;
1111
use futures_util::FutureExt;
1212
use http::request::Parts;
13+
use serde::{Deserialize, Serialize};
1314

1415
#[derive(Debug, Deserialize, FromRequestParts, utoipa::IntoParams)]
1516
#[from_request(via(Query))]

src/controllers/crate_owner_invitation.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ use diesel_async::{AsyncPgConnection, RunQueryDsl};
2222
use http::StatusCode;
2323
use http::request::Parts;
2424
use indexmap::IndexMap;
25+
use serde::{Deserialize, Serialize};
2526
use std::collections::{HashMap, HashSet};
2627

2728
#[derive(Serialize, utoipa::ToSchema)]

src/controllers/github/secret_scanning.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,14 @@ use minijinja::context;
2020
use p256::PublicKey;
2121
use p256::ecdsa::VerifyingKey;
2222
use p256::ecdsa::signature::Verifier;
23+
use serde::{Deserialize, Serialize};
2324
use serde_json as json;
2425
use std::collections::{BTreeMap, BTreeSet, HashMap};
2526
use std::str::FromStr;
2627
use std::sync::LazyLock;
2728
use std::time::Duration;
2829
use tokio::sync::Mutex;
29-
use tracing::warn;
30+
use tracing::{debug, warn};
3031

3132
// Minimum number of seconds to wait before refreshing cache of GitHub's public keys
3233
const PUBLIC_KEY_CACHE_LIFETIME: Duration = Duration::from_secs(60 * 60 * 24); // 24 hours

src/controllers/helpers.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
use axum::Json;
22
use axum::response::{IntoResponse, Response};
3+
use serde::Serialize;
34

45
pub mod authorization;
56
pub(crate) mod pagination;

0 commit comments

Comments
 (0)