From cb69a2d13294e0dd67b2923372467003dc063615 Mon Sep 17 00:00:00 2001 From: Bryan Stitt Date: Mon, 7 Nov 2022 22:14:59 +0000 Subject: [PATCH] cargo upgrade (requires rust 1.65+) --- Cargo.lock | 63 +++++++++++++------------------- deferred-rate-limiter/Cargo.toml | 2 +- entities/Cargo.toml | 2 +- migration/Cargo.toml | 2 +- web3_proxy/Cargo.toml | 10 ++--- 5 files changed, 34 insertions(+), 45 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 1cf401cd..888db6cd 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2422,9 +2422,9 @@ dependencies = [ [[package]] name = "ipnet" -version = "2.5.0" +version = "2.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "879d54834c8c76457ef4293a689b2a8c59b076067ad77b15efafbb05f92a592b" +checksum = "f88c5561171189e69df9d98bcf18fd5f9558300f7ea7b801eb8a0fd748bd8745" [[package]] name = "iri-string" @@ -2704,9 +2704,9 @@ dependencies = [ [[package]] name = "moka" -version = "0.9.5" +version = "0.9.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e013c8176e5aae43f4c0a982733c44feebddc4e7ac0871a109a9655e668487af" +checksum = "7b49a05f67020456541f4f29cbaa812016a266a86ec76f96d3873d459c68fe5e" dependencies = [ "async-io", "async-lock", @@ -2890,15 +2890,6 @@ dependencies = [ "libc", ] -[[package]] -name = "num_threads" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2819ce041d2ee131036f4fc9d6ae7ae125a3a40e97ba64d04fe799ad9dabbb44" -dependencies = [ - "libc", -] - [[package]] name = "number_prefix" version = "0.4.0" @@ -3696,9 +3687,9 @@ dependencies = [ [[package]] name = "regex" -version = "1.6.0" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c4eb3267174b8c6c2f654116623910a0fef09c4753f8dd83db29c48a0df988b" +checksum = "e076559ef8e241f2ae3479e36f97bd5741c0330689e217ad51ce2c76808b868a" dependencies = [ "aho-corasick", "memchr", @@ -4002,9 +3993,9 @@ dependencies = [ [[package]] name = "sea-orm" -version = "0.10.1" +version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c347aacd6bd1b9714fd8b5a6095b7caf4c7d6d3d2fc443c5668512effc52755d" +checksum = "75f0afff0dd7581c8cc88b35fdd42d207f379ce5cfc5a88e65b5aa95e0ec3d3f" dependencies = [ "async-stream", "async-trait", @@ -4023,7 +4014,7 @@ dependencies = [ "serde_json", "sqlx", "thiserror", - "time 0.3.16", + "time 0.3.17", "tracing", "url", "uuid 1.2.1", @@ -4031,9 +4022,9 @@ dependencies = [ [[package]] name = "sea-orm-cli" -version = "0.10.1" +version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ebf58d870d7748fae01bf0f346972941bf9f30bc25a10504ce32f3fd883ca62b" +checksum = "882af0d4cd3d6cc2f427d14a48e9f468b37c563b405ea486fd314ba18ca334d0" dependencies = [ "chrono", "clap", @@ -4047,9 +4038,9 @@ dependencies = [ [[package]] name = "sea-orm-macros" -version = "0.10.1" +version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51235dc3e7330b241a3ca2fcd00c315feffb3f9e3da193c18c01aca369be7ec7" +checksum = "2d1c53d3ed30403f210ef8a67da9d929a4d07a91b6478ae3ab827d2d91b88a84" dependencies = [ "bae", "heck 0.3.3", @@ -4060,9 +4051,9 @@ dependencies = [ [[package]] name = "sea-orm-migration" -version = "0.10.1" +version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9cc38a41f49640e5460b806766bea5cf66729ee6da9dab8b111a9cf5f6e57b9" +checksum = "86fe6e594b078712e1e797b951b9b56e55d3cfa04aac8ea76eb4bed7c94c5910" dependencies = [ "async-trait", "clap", @@ -4084,7 +4075,7 @@ dependencies = [ "rust_decimal", "sea-query-derive", "serde_json", - "time 0.3.16", + "time 0.3.17", "uuid 1.2.1", ] @@ -4099,7 +4090,7 @@ dependencies = [ "sea-query", "serde_json", "sqlx", - "time 0.3.16", + "time 0.3.17", "uuid 1.2.1", ] @@ -4293,7 +4284,7 @@ dependencies = [ "serde", "serde_json", "thiserror", - "time 0.3.16", + "time 0.3.17", "url", "uuid 1.2.1", ] @@ -4481,7 +4472,7 @@ dependencies = [ "rand 0.8.5", "sha3", "thiserror", - "time 0.3.16", + "time 0.3.17", ] [[package]] @@ -4662,7 +4653,7 @@ dependencies = [ "sqlx-rt", "stringprep", "thiserror", - "time 0.3.16", + "time 0.3.17", "tokio-stream", "url", "uuid 1.2.1", @@ -4942,13 +4933,11 @@ dependencies = [ [[package]] name = "time" -version = "0.3.16" +version = "0.3.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fab5c8b9980850e06d92ddbe3ab839c062c801f3927c0fb8abd6fc8e918fbca" +checksum = "a561bf4617eebd33bca6434b988f39ed798e527f51a1e797d0ee4f61c0a38376" dependencies = [ "itoa 1.0.2", - "libc", - "num_threads", "serde", "time-core", "time-macros", @@ -4962,9 +4951,9 @@ checksum = "2e153e1f1acaef8acc537e68b44906d2db6436e2b35ac2c6b42640fff91f00fd" [[package]] name = "time-macros" -version = "0.2.5" +version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "65bb801831d812c562ae7d2bfb531f26e66e4e1f6b17307ba4149c5064710e5b" +checksum = "d967f99f534ca7e495c575c62638eebc2898a8c84c119b89e250477bc4ba16b2" dependencies = [ "time-core", ] @@ -5611,7 +5600,7 @@ dependencies = [ "serde_json", "serde_prometheus", "siwe", - "time 0.3.16", + "time 0.3.17", "tokio", "tokio-stream", "toml", @@ -5791,7 +5780,7 @@ dependencies = [ "hmac", "pbkdf2 0.10.1", "sha1", - "time 0.3.16", + "time 0.3.17", "zstd", ] diff --git a/deferred-rate-limiter/Cargo.toml b/deferred-rate-limiter/Cargo.toml index 64a87d73..781f4760 100644 --- a/deferred-rate-limiter/Cargo.toml +++ b/deferred-rate-limiter/Cargo.toml @@ -9,6 +9,6 @@ redis-rate-limiter = { path = "../redis-rate-limiter" } anyhow = "1.0.66" hashbrown = "0.12.3" -moka = { version = "0.9.5", default-features = false, features = ["future"] } +moka = { version = "0.9.6", default-features = false, features = ["future"] } tokio = "1.21.2" tracing = "0.1.37" diff --git a/entities/Cargo.toml b/entities/Cargo.toml index cfde5d47..a76ab003 100644 --- a/entities/Cargo.toml +++ b/entities/Cargo.toml @@ -10,6 +10,6 @@ path = "src/mod.rs" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -sea-orm = "0.10.1" +sea-orm = "0.10.2" serde = "1.0.147" uuid = "1.2.1" diff --git a/migration/Cargo.toml b/migration/Cargo.toml index 06b0d959..b32f61eb 100644 --- a/migration/Cargo.toml +++ b/migration/Cargo.toml @@ -12,7 +12,7 @@ path = "src/lib.rs" tokio = { version = "1.21.2", features = ["full", "tracing"] } [dependencies.sea-orm-migration] -version = "0.10.1" +version = "0.10.2" features = [ # Enable at least one `ASYNC_RUNTIME` and `DATABASE_DRIVER` feature if you want to run migration via CLI. # View the list of supported features at https://www.sea-ql.org/SeaORM/docs/install-and-config/database-and-async-runtime. diff --git a/web3_proxy/Cargo.toml b/web3_proxy/Cargo.toml index 86d5c09f..b26714d4 100644 --- a/web3_proxy/Cargo.toml +++ b/web3_proxy/Cargo.toml @@ -37,9 +37,9 @@ futures = { version = "0.3.25", features = ["thread-pool"] } hashbrown = { version = "0.12.3", features = ["serde"] } hdrhistogram = "7.5.2" http = "0.2.8" -ipnet = "2.5.0" +ipnet = "2.5.1" metered = { version = "0.9.0", features = ["serialize"] } -moka = { version = "0.9.5", default-features = false, features = ["future"] } +moka = { version = "0.9.6", default-features = false, features = ["future"] } notify = "5.0.0" num = "0.4.0" # TODO: import num_traits from sea-orm so we always have the same version @@ -49,19 +49,19 @@ petgraph = "0.6.2" proctitle = "0.1.1" rand = "0.8.5" # TODO: regex has several "perf" features that we might want to use -regex = "1.6.0" +regex = "1.7.0" reqwest = { version = "0.11.12", default-features = false, features = ["json", "tokio-rustls"] } handlebars = "4.3.5" rustc-hash = "1.1.0" siwe = "0.5.0" -sea-orm = { version = "0.10.1", features = ["macros"] } +sea-orm = { version = "0.10.2", features = ["macros"] } sentry = { version = "0.28.0", default-features = false, features = ["backtrace", "contexts", "panic", "anyhow", "reqwest", "rustls"] } sentry-tracing = "0.28.0" serde = { version = "1.0.147", features = [] } serde_json = { version = "1.0.87", default-features = false, features = ["alloc", "raw_value"] } serde_prometheus = "0.1.6" # TODO: make sure this time version matches siwe. PR to put this in their prelude -time = "0.3.16" +time = "0.3.17" tokio = { version = "1.21.2", features = ["full", "tracing"] } # TODO: make sure this uuid version matches sea-orm. PR to put this in their prelude tokio-stream = { version = "0.1.11", features = ["sync"] }