From b4d888747732bceb3a47809f80fc07f917ac8cc1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 24 Mar 2025 22:31:05 +0000 Subject: [PATCH 1/2] build(deps): bump derive_more from 0.99.18 to 2.0.1 Bumps [derive_more](https://github.com/JelteF/derive_more) from 0.99.18 to 2.0.1. - [Release notes](https://github.com/JelteF/derive_more/releases) - [Changelog](https://github.com/JelteF/derive_more/blob/master/CHANGELOG.md) - [Commits](https://github.com/JelteF/derive_more/compare/v0.99.18...v2.0.1) --- updated-dependencies: - dependency-name: derive_more dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- Cargo.lock | 28 ++++++++++++++++++++++++---- store/postgres/Cargo.toml | 2 +- 2 files changed, 25 insertions(+), 5 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index a7ea378f9e3..812dca913a3 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1182,9 +1182,9 @@ 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", "proc-macro2", @@ -1193,6 +1193,26 @@ dependencies = [ "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 = [ + "proc-macro2", + "quote", + "syn 2.0.87", +] + [[package]] name = "diesel" version = "2.2.7" @@ -2137,7 +2157,7 @@ dependencies = [ "blake3 1.6.1", "chrono", "clap", - "derive_more", + "derive_more 2.0.1", "diesel", "diesel-derive-enum", "diesel-dynamic-schema", @@ -6403,7 +6423,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..8610a49f1d3 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" } diesel = { workspace = true } diesel-dynamic-schema = { workspace = true } diesel-derive-enum = { workspace = true } From 5aa0901b38968e5ecb4d256d07da4c54ed75d26b Mon Sep 17 00:00:00 2001 From: Filipe Azevedo Date: Mon, 21 Apr 2025 17:38:01 +0900 Subject: [PATCH 2/2] fix version --- Cargo.lock | 19 ++++++++++++++++++- store/postgres/Cargo.toml | 2 +- store/postgres/src/block_range.rs | 1 + store/postgres/src/lib.rs | 2 -- 4 files changed, 20 insertions(+), 4 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 812dca913a3..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" @@ -1186,7 +1195,7 @@ version = "0.99.19" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3da29a38df43d6f156149c9b43ded5e018ddff2a855cf2cfd62e8cd7d079c69f" dependencies = [ - "convert_case", + "convert_case 0.4.0", "proc-macro2", "quote", "rustc_version", @@ -1208,9 +1217,11 @@ 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]] @@ -5829,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" diff --git a/store/postgres/Cargo.toml b/store/postgres/Cargo.toml index 8610a49f1d3..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 = "2.0.1" } +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]