diff --git a/Cargo.lock b/Cargo.lock index a7ea378f9e3..e10df858f68 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -791,6 +791,15 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6245d59a3e82a7fc217c5828a6692dbc6dfb63a0c8c90495621f7b9d79704a0e" +[[package]] +name = "convert_case" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bb402b8d4c85569410425650ce3eddc7d698ed96d39a73f941b08fb63082f1e7" +dependencies = [ + "unicode-segmentation", +] + [[package]] name = "core-foundation" version = "0.9.4" @@ -1182,17 +1191,39 @@ dependencies = [ [[package]] name = "derive_more" -version = "0.99.18" +version = "0.99.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f33878137e4dafd7fa914ad4e259e18a4e8e532b9617a2d0150262bf53abfce" +checksum = "3da29a38df43d6f156149c9b43ded5e018ddff2a855cf2cfd62e8cd7d079c69f" dependencies = [ - "convert_case", + "convert_case 0.4.0", "proc-macro2", "quote", "rustc_version", "syn 2.0.87", ] +[[package]] +name = "derive_more" +version = "2.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "093242cf7570c207c83073cf82f79706fe7b8317e98620a47d5be7c3d8497678" +dependencies = [ + "derive_more-impl", +] + +[[package]] +name = "derive_more-impl" +version = "2.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bda628edc44c4bb645fbe0f758797143e4e07926f7ebf4e9bdfbd3d2ce621df3" +dependencies = [ + "convert_case 0.7.1", + "proc-macro2", + "quote", + "syn 2.0.87", + "unicode-xid", +] + [[package]] name = "diesel" version = "2.2.7" @@ -2137,7 +2168,7 @@ dependencies = [ "blake3 1.6.1", "chrono", "clap", - "derive_more", + "derive_more 2.0.1", "diesel", "diesel-derive-enum", "diesel-dynamic-schema", @@ -5809,6 +5840,12 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e4259d9d4425d9f0661581b804cb85fe66a4c631cadd8f490d1c13a35d5d9291" +[[package]] +name = "unicode-segmentation" +version = "1.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f6ccf251212114b54433ec949fd6a7841275f9ada20dddd2f29e9ceea4501493" + [[package]] name = "unicode-width" version = "0.1.13" @@ -6403,7 +6440,7 @@ dependencies = [ "arrayvec 0.7.4", "base64 0.13.1", "bytes", - "derive_more", + "derive_more 0.99.19", "ethabi", "ethereum-types", "futures 0.3.30", diff --git a/store/postgres/Cargo.toml b/store/postgres/Cargo.toml index 9a746646807..ec86c4554ae 100644 --- a/store/postgres/Cargo.toml +++ b/store/postgres/Cargo.toml @@ -7,7 +7,7 @@ edition.workspace = true async-trait = "0.1.50" blake3 = "1.6" chrono = { workspace = true } -derive_more = { version = "0.99.18" } +derive_more = { version = "2.0.1", features = ["full"] } diesel = { workspace = true } diesel-dynamic-schema = { workspace = true } diesel-derive-enum = { workspace = true } diff --git a/store/postgres/src/block_range.rs b/store/postgres/src/block_range.rs index 7dbcaa29c00..d6044c644ad 100644 --- a/store/postgres/src/block_range.rs +++ b/store/postgres/src/block_range.rs @@ -1,3 +1,4 @@ +use derive_more::Constructor; use diesel::pg::Pg; use diesel::query_builder::{AstPass, QueryFragment}; use diesel::result::QueryResult; diff --git a/store/postgres/src/lib.rs b/store/postgres/src/lib.rs index 759e8601313..de16069af75 100644 --- a/store/postgres/src/lib.rs +++ b/store/postgres/src/lib.rs @@ -2,8 +2,6 @@ //! [Store] for the details of how the store is organized across //! different databases/shards. -#[macro_use] -extern crate derive_more; #[macro_use] extern crate diesel; #[macro_use]