diff --git a/Cargo.lock b/Cargo.lock index 91639c3312a..baaa975463e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -216,7 +216,7 @@ checksum = "721cae7de5c34fbb2acd27e21e6d2cf7b886dce0c27388d46c4e6c47ea4318dd" dependencies = [ "proc-macro2", "quote", - "syn 2.0.90", + "syn", ] [[package]] @@ -582,7 +582,7 @@ checksum = "57d123550fa8d071b7255cb0cc04dc302baa6c8c4a79f55701552684d8399bce" dependencies = [ "proc-macro2", "quote", - "syn 2.0.90", + "syn", ] [[package]] @@ -703,7 +703,7 @@ dependencies = [ "proc-macro2", "quote", "rustversion", - "syn 2.0.90", + "syn", ] [[package]] @@ -917,7 +917,7 @@ dependencies = [ "heck", "proc-macro2", "quote", - "syn 2.0.90", + "syn", ] [[package]] @@ -1068,7 +1068,7 @@ dependencies = [ "crates_io_worker", "csv", "deadpool-diesel", - "derive_deref", + "derive_more", "dialoguer", "diesel", "diesel-async", @@ -1138,7 +1138,7 @@ dependencies = [ "claims", "clap", "criterion", - "derive_deref", + "derive_more", "insta", "percent-encoding", "semver", @@ -1489,7 +1489,7 @@ dependencies = [ "proc-macro2", "quote", "strsim", - "syn 2.0.90", + "syn", ] [[package]] @@ -1500,7 +1500,7 @@ checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806" dependencies = [ "darling_core", "quote", - "syn 2.0.90", + "syn", ] [[package]] @@ -1582,7 +1582,7 @@ checksum = "30542c1ad912e0e3d22a1935c290e12e8a29d704a420177a31faad4a601a0800" dependencies = [ "proc-macro2", "quote", - "syn 2.0.90", + "syn", ] [[package]] @@ -1603,7 +1603,7 @@ dependencies = [ "darling", "proc-macro2", "quote", - "syn 2.0.90", + "syn", ] [[package]] @@ -1613,18 +1613,27 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ab63b0e2bf4d5928aff72e83a7dace85d7bba5fe12dcc3c5a572d78caffd3f3c" dependencies = [ "derive_builder_core", - "syn 2.0.90", + "syn", ] [[package]] -name = "derive_deref" -version = "1.1.1" +name = "derive_more" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4a9b99b9cbbe49445b21764dc0625032a89b145a2642e67603e1c936f5458d05" +dependencies = [ + "derive_more-impl", +] + +[[package]] +name = "derive_more-impl" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcdbcee2d9941369faba772587a565f4f534e42cb8d17e5295871de730163b2b" +checksum = "cb7330aeadfbe296029522e6c40f315320aba36fc43a5b3632f3795348f3bd22" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn", ] [[package]] @@ -1691,7 +1700,7 @@ dependencies = [ "dsl_auto_type", "proc-macro2", "quote", - "syn 2.0.90", + "syn", ] [[package]] @@ -1720,7 +1729,7 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "209c735641a413bc68c4923a9d6ad4bcb3ca306b794edaa7eb0b3228a99ffb25" dependencies = [ - "syn 2.0.90", + "syn", ] [[package]] @@ -1752,7 +1761,7 @@ checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.90", + "syn", ] [[package]] @@ -1778,7 +1787,7 @@ dependencies = [ "heck", "proc-macro2", "quote", - "syn 2.0.90", + "syn", ] [[package]] @@ -2032,7 +2041,7 @@ checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650" dependencies = [ "proc-macro2", "quote", - "syn 2.0.90", + "syn", ] [[package]] @@ -2153,7 +2162,7 @@ checksum = "f5070fa86976044fe2b004d874c10af5d1aed6d8f6a72ff93a6eb29cc87048bc" dependencies = [ "proc-macro2", "quote", - "syn 2.0.90", + "syn", ] [[package]] @@ -2319,7 +2328,7 @@ dependencies = [ "markup5ever", "proc-macro2", "quote", - "syn 2.0.90", + "syn", ] [[package]] @@ -2660,7 +2669,7 @@ checksum = "1ec89e9337638ecdc08744df490b221a7399bf8d164eb52a665454e60e075ad6" dependencies = [ "proc-macro2", "quote", - "syn 2.0.90", + "syn", ] [[package]] @@ -3146,7 +3155,7 @@ dependencies = [ "cfg-if", "proc-macro2", "quote", - "syn 2.0.90", + "syn", ] [[package]] @@ -3365,7 +3374,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.90", + "syn", ] [[package]] @@ -3496,7 +3505,7 @@ dependencies = [ "pest_meta", "proc-macro2", "quote", - "syn 2.0.90", + "syn", ] [[package]] @@ -3584,7 +3593,7 @@ checksum = "3c0f5fad0874fc7abcd4d750e76917eaebbecaa2c20bde22e1dbeeba8beb758c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.90", + "syn", ] [[package]] @@ -3766,7 +3775,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "64d1ec885c64d0457d564db4ec299b2dae3f9c02808b8ad9c3a089c591b18033" dependencies = [ "proc-macro2", - "syn 2.0.90", + "syn", ] [[package]] @@ -4559,7 +4568,7 @@ checksum = "46f859dbbf73865c6627ed570e78961cd3ac92407a2d117204c49232485da55e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.90", + "syn", ] [[package]] @@ -4728,7 +4737,7 @@ dependencies = [ "heck", "proc-macro2", "quote", - "syn 2.0.90", + "syn", ] [[package]] @@ -4834,17 +4843,6 @@ version = "2.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292" -[[package]] -name = "syn" -version = "1.0.109" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" -dependencies = [ - "proc-macro2", - "quote", - "unicode-ident", -] - [[package]] name = "syn" version = "2.0.90" @@ -4879,7 +4877,7 @@ checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971" dependencies = [ "proc-macro2", "quote", - "syn 2.0.90", + "syn", ] [[package]] @@ -5001,7 +4999,7 @@ checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1" dependencies = [ "proc-macro2", "quote", - "syn 2.0.90", + "syn", ] [[package]] @@ -5012,7 +5010,7 @@ checksum = "d65750cab40f4ff1929fb1ba509e9914eb756131cef4210da8d5d700d26f6312" dependencies = [ "proc-macro2", "quote", - "syn 2.0.90", + "syn", ] [[package]] @@ -5136,7 +5134,7 @@ checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752" dependencies = [ "proc-macro2", "quote", - "syn 2.0.90", + "syn", ] [[package]] @@ -5329,7 +5327,7 @@ checksum = "395ae124c09f9e6918a2310af6038fba074bcf474ac352496d5910dd59a2226d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.90", + "syn", ] [[package]] @@ -5657,7 +5655,7 @@ dependencies = [ "log", "proc-macro2", "quote", - "syn 2.0.90", + "syn", "wasm-bindgen-shared", ] @@ -5692,7 +5690,7 @@ checksum = "30d7a95b763d3c45903ed6c81f156801839e5ee968bb07e534c44df0fcd330c2" dependencies = [ "proc-macro2", "quote", - "syn 2.0.90", + "syn", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -6049,7 +6047,7 @@ checksum = "2380878cad4ac9aac1e2435f3eb4020e8374b5f13c296cb75b4620ff8e229154" dependencies = [ "proc-macro2", "quote", - "syn 2.0.90", + "syn", "synstructure", ] @@ -6071,7 +6069,7 @@ checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.90", + "syn", ] [[package]] @@ -6091,7 +6089,7 @@ checksum = "595eed982f7d355beb85837f651fa22e90b3c044842dc7f2c2842c086f295808" dependencies = [ "proc-macro2", "quote", - "syn 2.0.90", + "syn", "synstructure", ] @@ -6120,7 +6118,7 @@ checksum = "6eafa6dfb17584ea3e2bd6e76e0cc15ad7af12b09abdd1ca55961bed9b1063c6" dependencies = [ "proc-macro2", "quote", - "syn 2.0.90", + "syn", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index 97ae0bd590e..9594d8e2379 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -71,7 +71,7 @@ chrono = { version = "=0.4.39", default-features = false, features = ["serde"] } clap = { version = "=4.5.23", features = ["derive", "env", "unicode", "wrap_help"] } cookie = { version = "=0.18.1", features = ["secure"] } deadpool-diesel = { version = "=0.6.1", features = ["postgres", "tracing"] } -derive_deref = "=1.1.1" +derive_more = { version = "=1.0.0", features = ["deref"] } dialoguer = "=0.11.0" diesel = { version = "=2.2.6", features = ["postgres", "serde_json", "chrono", "numeric"] } diesel-async = { version = "=0.5.2", features = ["async-connection-wrapper", "deadpool", "postgres"] } diff --git a/crates/crates_io_cdn_logs/Cargo.toml b/crates/crates_io_cdn_logs/Cargo.toml index f97b87d6600..6108b99bd87 100644 --- a/crates/crates_io_cdn_logs/Cargo.toml +++ b/crates/crates_io_cdn_logs/Cargo.toml @@ -11,7 +11,7 @@ workspace = true anyhow = "=1.0.94" async-compression = { version = "=0.4.18", features = ["gzip", "tokio", "zstd"] } chrono = { version = "=0.4.39", features = ["serde"] } -derive_deref = "=1.1.1" +derive_more = { version = "=1.0.0", features = ["deref"] } percent-encoding = "=2.3.1" semver = "=1.0.23" serde = { version = "=1.0.216", features = ["derive"] } diff --git a/crates/crates_io_cdn_logs/src/download_map.rs b/crates/crates_io_cdn_logs/src/download_map.rs index 37ba527c3ec..795cc07bf22 100644 --- a/crates/crates_io_cdn_logs/src/download_map.rs +++ b/crates/crates_io_cdn_logs/src/download_map.rs @@ -1,5 +1,5 @@ use chrono::NaiveDate; -use derive_deref::Deref; +use derive_more::Deref; use semver::Version; use std::collections::{HashMap, HashSet}; use std::fmt::Debug; diff --git a/src/lib.rs b/src/lib.rs index bd01bc36399..2296fa16ff0 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -8,8 +8,6 @@ #[macro_use] extern crate claims; #[macro_use] -extern crate derive_deref; -#[macro_use] extern crate diesel; #[macro_use] extern crate serde; diff --git a/src/middleware/log_request.rs b/src/middleware/log_request.rs index 67974305afd..c5d37bb44fc 100644 --- a/src/middleware/log_request.rs +++ b/src/middleware/log_request.rs @@ -11,6 +11,7 @@ use axum::response::IntoResponse; use axum::Extension; use axum_extra::headers::UserAgent; use axum_extra::TypedHeader; +use derive_more::Deref; use http::{Method, Uri}; use parking_lot::Mutex; use std::borrow::Cow; diff --git a/src/middleware/real_ip.rs b/src/middleware/real_ip.rs index 1d691eaf3ad..20f323bdd4d 100644 --- a/src/middleware/real_ip.rs +++ b/src/middleware/real_ip.rs @@ -2,6 +2,7 @@ use crate::real_ip::process_xff_headers; use axum::extract::{ConnectInfo, Request}; use axum::middleware::Next; use axum::response::IntoResponse; +use derive_more::Deref; use std::net::{IpAddr, SocketAddr}; #[derive(Copy, Clone, Debug, Deref)]