From 9bfc3ce72ff1caccc3e762c9193eac7dbda463b5 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Fri, 18 Nov 2022 08:05:55 +0000 Subject: [PATCH 01/25] Update Rust crate serde_json to 1.0.88 --- Cargo.lock | 4 ++-- Cargo.toml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 196cd74..06f7194 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -745,9 +745,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.87" +version = "1.0.88" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ce777b7b150d76b9cf60d28b55f5847135a003f7d7350c6be7a773508ce7d45" +checksum = "8e8b3801309262e8184d9687fb697586833e939767aea0dda89f5a8e650e8bd7" dependencies = [ "itoa", "ryu", diff --git a/Cargo.toml b/Cargo.toml index a0a1d49..3815476 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -22,7 +22,7 @@ flate2 = "1.0.24" tokio-util = { version = "0.7.4", features = ["io"] } futures-util = "0.3.25" uuid = { version = "1.2.1", features = ["v4"] } -serde_json = "1.0.87" +serde_json = "1.0.88" metrics = "0.20.1" metrics-exporter-prometheus = "0.11.0" serde = { version = "1.0", features = ["derive"] } From 489a700e2213eb55ecabdb490cd587c96ac560a5 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Fri, 18 Nov 2022 22:05:29 +0000 Subject: [PATCH 02/25] Update Rust crate tokio to 1.22.0 --- Cargo.lock | 4 ++-- Cargo.toml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 196cd74..157b9a0 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -892,9 +892,9 @@ dependencies = [ [[package]] name = "tokio" -version = "1.21.2" +version = "1.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9e03c497dc955702ba729190dc4aac6f2a0ce97f913e5b1b5912fc5039d9099" +checksum = "d76ce4a75fb488c605c54bf610f221cea8b0dafb53333c1a67e8ee199dcd2ae3" dependencies = [ "autocfg", "bytes", diff --git a/Cargo.toml b/Cargo.toml index a0a1d49..4ed46a1 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -13,7 +13,7 @@ name = "site" [dependencies] axum = { version = "0.5.17" } hyper = { version = "0.14.21" } -tokio = { version = "1.21.2", features = ["full"] } +tokio = { version = "1.22.0", features = ["full"] } tracing = "0.1.37" tracing-subscriber = {version = "0.3.16", features = ["env-filter"] } tower-http = { version = "0.3.4", features = ["fs", "trace", "auth"] } From de8870036f106d00018cf90c2ac2de10fe23ea96 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Thu, 24 Nov 2022 15:02:29 +0000 Subject: [PATCH 03/25] Update Rust crate flate2 to 1.0.25 --- Cargo.lock | 8 ++++---- Cargo.toml | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 7ef4a8b..5e0a9d9 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -160,9 +160,9 @@ dependencies = [ [[package]] name = "flate2" -version = "1.0.24" +version = "1.0.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f82b0f4c27ad9f8bfd1f3208d882da2b09c301bc1c828fd3a00d0216d2fbbff6" +checksum = "a8a2db397cb1c8772f31494cb8917e48cd1e64f0fa7efac59fbd741a0a8ce841" dependencies = [ "crc32fast", "miniz_oxide", @@ -517,9 +517,9 @@ dependencies = [ [[package]] name = "miniz_oxide" -version = "0.5.1" +version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2b29bd4bc3f33391105ebee3589c19197c4271e3e5a9ec9bfe8127eeff8f082" +checksum = "b275950c28b37e794e8c55d88aeb5e139d0ce23fdbbeda68f8d7174abdf9e8fa" dependencies = [ "adler", ] diff --git a/Cargo.toml b/Cargo.toml index 96f24c2..db4e230 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -18,7 +18,7 @@ tracing = "0.1.37" tracing-subscriber = {version = "0.3.16", features = ["env-filter"] } tower-http = { version = "0.3.4", features = ["fs", "trace", "auth"] } tar = "0.4.38" -flate2 = "1.0.24" +flate2 = "1.0.25" tokio-util = { version = "0.7.4", features = ["io"] } futures-util = "0.3.25" uuid = { version = "1.2.1", features = ["v4"] } From 003f198bae6b68bef7bb097fc8353766795c228f Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Tue, 29 Nov 2022 09:02:12 +0000 Subject: [PATCH 04/25] Update Rust crate axum to 0.6.1 --- Cargo.lock | 34 ++++++++++++++++++++++++++-------- Cargo.toml | 2 +- 2 files changed, 27 insertions(+), 9 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 7ef4a8b..123e166 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -38,9 +38,9 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" [[package]] name = "axum" -version = "0.5.17" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "acee9fd5073ab6b045a275b3e709c163dd36c90685219cb21804a147b58dba43" +checksum = "08b108ad2665fa3f6e6a517c3d80ec3e77d224c47d605167aefaa5d7ef97fa48" dependencies = [ "async-trait", "axum-core", @@ -56,8 +56,10 @@ dependencies = [ "mime", "percent-encoding", "pin-project-lite", + "rustversion", "serde", "serde_json", + "serde_path_to_error", "serde_urlencoded", "sync_wrapper", "tokio", @@ -69,9 +71,9 @@ dependencies = [ [[package]] name = "axum-core" -version = "0.2.9" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37e5939e02c56fecd5c017c37df4238c0a839fa76b7f97acdd7efb804fd181cc" +checksum = "79b8558f5a0581152dc94dcd289132a1d377494bdeafcd41869b3258e3e2ad92" dependencies = [ "async-trait", "bytes", @@ -79,6 +81,7 @@ dependencies = [ "http", "http-body", "mime", + "rustversion", "tower-layer", "tower-service", ] @@ -422,9 +425,9 @@ checksum = "a3e378b66a060d48947b590737b30a1be76706c8dd7b8ba0f2fe3989c68a853f" [[package]] name = "matchit" -version = "0.5.0" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73cbba799671b762df5a175adf59ce145165747bb891505c43d09aefbbf38beb" +checksum = "b87248edafb776e59e6ee64a79086f65890d3510f2c656c000bf2a7e8a0aea40" [[package]] name = "memchr" @@ -711,6 +714,12 @@ version = "0.6.25" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f497285884f3fcff424ffc933e56d7cbca511def0c9831a7f9b5f6153e3cc89b" +[[package]] +name = "rustversion" +version = "1.0.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "97477e48b4cf8603ad5f7aaf897467cf42ab4218a38ef76fb14c2d6773a6d6a8" + [[package]] name = "ryu" version = "1.0.9" @@ -754,6 +763,15 @@ dependencies = [ "serde", ] +[[package]] +name = "serde_path_to_error" +version = "0.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "184c643044780f7ceb59104cef98a5a6f12cb2288a7bc701ab93a362b49fd47d" +dependencies = [ + "serde", +] + [[package]] name = "serde_urlencoded" version = "0.7.1" @@ -979,9 +997,9 @@ dependencies = [ [[package]] name = "tower-layer" -version = "0.3.1" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "343bc9466d3fe6b0f960ef45960509f84480bf4fd96f92901afe7ff3df9d3a62" +checksum = "c20c8dbed6283a09604c3e69b4b7eeb54e298b8a600d4d5ecb5ad39de609f1d0" [[package]] name = "tower-service" diff --git a/Cargo.toml b/Cargo.toml index 96f24c2..7de93b9 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -11,7 +11,7 @@ name = "site" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -axum = { version = "0.5.17" } +axum = { version = "0.6.1" } hyper = { version = "0.14.21" } tokio = { version = "1.22.0", features = ["full"] } tracing = "0.1.37" From f9c23adbaffdbe588008f542829fa8918474e226 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Fri, 2 Dec 2022 14:02:52 +0000 Subject: [PATCH 05/25] Update Rust crate tower-http to 0.3.5 --- Cargo.lock | 4 ++-- Cargo.toml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 7ef4a8b..c182aee 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -952,9 +952,9 @@ dependencies = [ [[package]] name = "tower-http" -version = "0.3.4" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c530c8675c1dbf98facee631536fa116b5fb6382d7dd6dc1b118d970eafe3ba" +checksum = "f873044bf02dd1e8239e9c1293ea39dad76dc594ec16185d0a1bf31d8dc8d858" dependencies = [ "base64", "bitflags", diff --git a/Cargo.toml b/Cargo.toml index 96f24c2..2694751 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -16,7 +16,7 @@ hyper = { version = "0.14.21" } tokio = { version = "1.22.0", features = ["full"] } tracing = "0.1.37" tracing-subscriber = {version = "0.3.16", features = ["env-filter"] } -tower-http = { version = "0.3.4", features = ["fs", "trace", "auth"] } +tower-http = { version = "0.3.5", features = ["fs", "trace", "auth"] } tar = "0.4.38" flate2 = "1.0.24" tokio-util = { version = "0.7.4", features = ["io"] } From 0a0e032022d8fba439027651d674c5663ee8540e Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Tue, 6 Dec 2022 00:02:40 +0000 Subject: [PATCH 06/25] Update Rust crate tokio to 1.23.0 --- Cargo.lock | 63 +++++++++++++++++++++++++++++++++++++++++++++++++++--- Cargo.toml | 2 +- 2 files changed, 61 insertions(+), 4 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 7ef4a8b..3be945b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -892,9 +892,9 @@ dependencies = [ [[package]] name = "tokio" -version = "1.22.0" +version = "1.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d76ce4a75fb488c605c54bf610f221cea8b0dafb53333c1a67e8ee199dcd2ae3" +checksum = "eab6d665857cc6ca78d6e80303a02cea7a7851e85dfbd77cbdc09bd129f1ef46" dependencies = [ "autocfg", "bytes", @@ -907,7 +907,7 @@ dependencies = [ "signal-hook-registry", "socket2", "tokio-macros", - "winapi", + "windows-sys 0.42.0", ] [[package]] @@ -1228,6 +1228,27 @@ dependencies = [ "windows_x86_64_msvc 0.36.1", ] +[[package]] +name = "windows-sys" +version = "0.42.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7" +dependencies = [ + "windows_aarch64_gnullvm", + "windows_aarch64_msvc 0.42.0", + "windows_i686_gnu 0.42.0", + "windows_i686_msvc 0.42.0", + "windows_x86_64_gnu 0.42.0", + "windows_x86_64_gnullvm", + "windows_x86_64_msvc 0.42.0", +] + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.42.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "41d2aa71f6f0cbe00ae5167d90ef3cfe66527d6f613ca78ac8024c3ccab9a19e" + [[package]] name = "windows_aarch64_msvc" version = "0.34.0" @@ -1240,6 +1261,12 @@ version = "0.36.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9bb8c3fd39ade2d67e9874ac4f3db21f0d710bee00fe7cab16949ec184eeaa47" +[[package]] +name = "windows_aarch64_msvc" +version = "0.42.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd0f252f5a35cac83d6311b2e795981f5ee6e67eb1f9a7f64eb4500fbc4dcdb4" + [[package]] name = "windows_i686_gnu" version = "0.34.0" @@ -1252,6 +1279,12 @@ version = "0.36.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "180e6ccf01daf4c426b846dfc66db1fc518f074baa793aa7d9b9aaeffad6a3b6" +[[package]] +name = "windows_i686_gnu" +version = "0.42.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fbeae19f6716841636c28d695375df17562ca208b2b7d0dc47635a50ae6c5de7" + [[package]] name = "windows_i686_msvc" version = "0.34.0" @@ -1264,6 +1297,12 @@ version = "0.36.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e2e7917148b2812d1eeafaeb22a97e4813dfa60a3f8f78ebe204bcc88f12f024" +[[package]] +name = "windows_i686_msvc" +version = "0.42.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "84c12f65daa39dd2babe6e442988fc329d6243fdce47d7d2d155b8d874862246" + [[package]] name = "windows_x86_64_gnu" version = "0.34.0" @@ -1276,6 +1315,18 @@ version = "0.36.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4dcd171b8776c41b97521e5da127a2d86ad280114807d0b2ab1e462bc764d9e1" +[[package]] +name = "windows_x86_64_gnu" +version = "0.42.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bf7b1b21b5362cbc318f686150e5bcea75ecedc74dd157d874d754a2ca44b0ed" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.42.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09d525d2ba30eeb3297665bd434a54297e4170c7f1a44cad4ef58095b4cd2028" + [[package]] name = "windows_x86_64_msvc" version = "0.34.0" @@ -1288,6 +1339,12 @@ version = "0.36.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c811ca4a8c853ef420abd8592ba53ddbbac90410fab6903b3e79972a631f7680" +[[package]] +name = "windows_x86_64_msvc" +version = "0.42.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f40009d85759725a34da6d89a94e63d7bdc50a862acf0dbc7c8e488f1edcb6f5" + [[package]] name = "xattr" version = "0.2.2" diff --git a/Cargo.toml b/Cargo.toml index 96f24c2..eb42830 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -13,7 +13,7 @@ name = "site" [dependencies] axum = { version = "0.5.17" } hyper = { version = "0.14.21" } -tokio = { version = "1.22.0", features = ["full"] } +tokio = { version = "1.23.0", features = ["full"] } tracing = "0.1.37" tracing-subscriber = {version = "0.3.16", features = ["env-filter"] } tower-http = { version = "0.3.4", features = ["fs", "trace", "auth"] } From 3baf8ee4ae2eb09647bd2132c7618fa72a9df33a Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Sun, 18 Dec 2022 18:02:33 +0000 Subject: [PATCH 07/25] Update Rust crate serde_json to 1.0.91 --- Cargo.lock | 4 ++-- Cargo.toml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 7ef4a8b..fe41d52 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -745,9 +745,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.88" +version = "1.0.91" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e8b3801309262e8184d9687fb697586833e939767aea0dda89f5a8e650e8bd7" +checksum = "877c235533714907a8c2464236f5c4b2a17262ef1bd71f38f35ea592c8da6883" dependencies = [ "itoa", "ryu", diff --git a/Cargo.toml b/Cargo.toml index 96f24c2..63dafca 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -22,7 +22,7 @@ flate2 = "1.0.24" tokio-util = { version = "0.7.4", features = ["io"] } futures-util = "0.3.25" uuid = { version = "1.2.1", features = ["v4"] } -serde_json = "1.0.88" +serde_json = "1.0.91" metrics = "0.20.1" metrics-exporter-prometheus = "0.11.0" serde = { version = "1.0", features = ["derive"] } From 887e18384f8e3dae6f90d3a21685b468aa261c73 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Sat, 25 Mar 2023 01:04:29 +0000 Subject: [PATCH 08/25] Update Rust crate tower-http to 0.4.0 --- Cargo.lock | 28 +++++++++++++++++++++++----- Cargo.toml | 2 +- 2 files changed, 24 insertions(+), 6 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index e8a47da..d76e61f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -64,7 +64,7 @@ dependencies = [ "sync_wrapper", "tokio", "tower", - "tower-http", + "tower-http 0.3.5", "tower-layer", "tower-service", ] @@ -88,9 +88,9 @@ dependencies = [ [[package]] name = "base64" -version = "0.13.0" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd" +checksum = "0ea22880d78093b0cbe17c89f64a7d457941e65759157ec6cb31a31d652b05e5" [[package]] name = "bitflags" @@ -817,7 +817,7 @@ dependencies = [ "tar", "tokio", "tokio-util", - "tower-http", + "tower-http 0.4.0", "tracing", "tracing-subscriber", "uuid", @@ -973,6 +973,25 @@ name = "tower-http" version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f873044bf02dd1e8239e9c1293ea39dad76dc594ec16185d0a1bf31d8dc8d858" +dependencies = [ + "bitflags", + "bytes", + "futures-core", + "futures-util", + "http", + "http-body", + "http-range-header", + "pin-project-lite", + "tower", + "tower-layer", + "tower-service", +] + +[[package]] +name = "tower-http" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5d1d42a9b3f3ec46ba828e8d376aec14592ea199f70a06a548587ecd1c4ab658" dependencies = [ "base64", "bitflags", @@ -989,7 +1008,6 @@ dependencies = [ "pin-project-lite", "tokio", "tokio-util", - "tower", "tower-layer", "tower-service", "tracing", diff --git a/Cargo.toml b/Cargo.toml index bca3f1c..45180d8 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -16,7 +16,7 @@ hyper = { version = "0.14.21" } tokio = { version = "1.23.0", features = ["full"] } tracing = "0.1.37" tracing-subscriber = {version = "0.3.16", features = ["env-filter"] } -tower-http = { version = "0.3.5", features = ["fs", "trace", "auth"] } +tower-http = { version = "0.4.0", features = ["fs", "trace", "auth"] } tar = "0.4.38" flate2 = "1.0.25" tokio-util = { version = "0.7.4", features = ["io"] } From dfd8b837881472e8f1c4c92c92443babf84e5981 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Tue, 25 Apr 2023 19:01:54 +0000 Subject: [PATCH 09/25] Update Rust crate tokio-util to 0.7.8 --- Cargo.lock | 4 ++-- Cargo.toml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index e8a47da..a70d86d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -941,9 +941,9 @@ dependencies = [ [[package]] name = "tokio-util" -version = "0.7.4" +version = "0.7.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0bb2e075f03b3d66d8d8785356224ba688d2906a371015e225beeb65ca92c740" +checksum = "806fe8c2c87eccc8b3267cbae29ed3ab2d0bd37fca70ab622e46aaa9375ddb7d" dependencies = [ "bytes", "futures-core", diff --git a/Cargo.toml b/Cargo.toml index bca3f1c..5c0ff32 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -19,7 +19,7 @@ tracing-subscriber = {version = "0.3.16", features = ["env-filter"] } tower-http = { version = "0.3.5", features = ["fs", "trace", "auth"] } tar = "0.4.38" flate2 = "1.0.25" -tokio-util = { version = "0.7.4", features = ["io"] } +tokio-util = { version = "0.7.8", features = ["io"] } futures-util = "0.3.25" uuid = { version = "1.2.1", features = ["v4"] } serde_json = "1.0.91" From 2566345cce4683ab4efe23be26774cb4fc9f0708 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Tue, 25 Apr 2023 19:01:57 +0000 Subject: [PATCH 10/25] Update Rust crate tokio to 1.28.0 --- Cargo.lock | 109 +++++++++++++++++++++++++++++++---------------------- Cargo.toml | 2 +- 2 files changed, 65 insertions(+), 46 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index e8a47da..296d44e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -27,7 +27,7 @@ checksum = "ed6aa3524a2dfcf9fe180c51eae2b58738348d819517ceadf95789c51fff7600" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.103", ] [[package]] @@ -210,7 +210,7 @@ checksum = "bdfb8ce053d86b91919aad980c220b1fb8401a9394410e1c289ed7e66b61835d" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.103", ] [[package]] @@ -376,9 +376,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" [[package]] name = "libc" -version = "0.2.122" +version = "0.2.142" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec647867e2bf0772e28c8bcde4f0d19a9216916e890543b5a03ed8ef27b8f259" +checksum = "6a987beff54b60ffa6d51982e1aa1146bc42f19bd26be28b0586f252fccf5317" [[package]] name = "lock_api" @@ -482,7 +482,7 @@ checksum = "731f8ecebd9f3a4aa847dfe75455e4757a45da40a7793d2f0b1f9b6ed18b23f3" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.103", ] [[package]] @@ -617,7 +617,7 @@ checksum = "744b6f092ba29c3650faf274db506afd39944f48420f6c86b17cfe0ee1cb36bb" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.103", ] [[package]] @@ -640,9 +640,9 @@ checksum = "763095e04dcbeb889b2ab35296ecb18a20fe16b4e9877ce64aab73d8fd05a8c3" [[package]] name = "proc-macro2" -version = "1.0.47" +version = "1.0.56" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ea3d908b0e36316caf9e9e2c4625cdde190a7e6f440d794667ed17a1855e725" +checksum = "2b63bdb0cd06f1f4dedf69b254734f9b45af66e4a031e42a7480257d9898b435" dependencies = [ "unicode-ident", ] @@ -665,9 +665,9 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.17" +version = "1.0.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "632d02bff7f874a36f33ea8bb416cd484b90cc66c1194b1a1110d067a7013f58" +checksum = "4424af4bf778aae2051a77b60283332f386554255d722233d09fbfc7e30da2fc" dependencies = [ "proc-macro2", ] @@ -749,7 +749,7 @@ checksum = "08597e7152fcd306f41838ed3e37be9eaeed2b61c42e2117266a554fab4662f9" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.103", ] [[package]] @@ -843,9 +843,9 @@ checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0" [[package]] name = "socket2" -version = "0.4.4" +version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "66d72b759436ae32898a2af0a14218dbf55efde3feeb170eb623637db85ee1e0" +checksum = "64a4a911eed85daf18834cfaa86a79b7d266ff93ff5ba14005426219480ed662" dependencies = [ "libc", "winapi", @@ -862,6 +862,17 @@ dependencies = [ "unicode-ident", ] +[[package]] +name = "syn" +version = "2.0.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a34fcf3e8b60f57e6a14301a2e916d323af98b0ea63c599441eec8558660c822" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + [[package]] name = "sync_wrapper" version = "0.1.1" @@ -896,7 +907,7 @@ checksum = "aa32fd3f627f367fe16f893e2597ae3c05020f8bba2666a4e6ea73d377e5714b" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.103", ] [[package]] @@ -910,14 +921,13 @@ dependencies = [ [[package]] name = "tokio" -version = "1.23.0" +version = "1.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eab6d665857cc6ca78d6e80303a02cea7a7851e85dfbd77cbdc09bd129f1ef46" +checksum = "c3c786bf8134e5a3a166db9b29ab8f48134739014a3eca7bc6bfa95d673b136f" dependencies = [ "autocfg", "bytes", "libc", - "memchr", "mio", "num_cpus", "parking_lot", @@ -925,18 +935,18 @@ dependencies = [ "signal-hook-registry", "socket2", "tokio-macros", - "windows-sys 0.42.0", + "windows-sys 0.48.0", ] [[package]] name = "tokio-macros" -version = "1.7.0" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b557f72f448c511a979e2564e55d74e6c4432fc96ff4f6241bc6bded342643b7" +checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.15", ] [[package]] @@ -1028,7 +1038,7 @@ checksum = "4017f8f45139870ca7e672686113917c71c7a6e02d4924eda67186083c03081a" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.103", ] [[package]] @@ -1155,7 +1165,7 @@ dependencies = [ "log", "proc-macro2", "quote", - "syn", + "syn 1.0.103", "wasm-bindgen-shared", ] @@ -1177,7 +1187,7 @@ checksum = "99ec0dc7a4756fffc231aab1b9f2f578d23cd391390ab27f952ae0c9b3ece20b" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.103", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -1248,24 +1258,33 @@ dependencies = [ [[package]] name = "windows-sys" -version = "0.42.0" +version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7" +checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" +dependencies = [ + "windows-targets", +] + +[[package]] +name = "windows-targets" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b1eb6f0cd7c80c79759c929114ef071b87354ce476d9d94271031c0497adfd5" dependencies = [ "windows_aarch64_gnullvm", - "windows_aarch64_msvc 0.42.0", - "windows_i686_gnu 0.42.0", - "windows_i686_msvc 0.42.0", - "windows_x86_64_gnu 0.42.0", + "windows_aarch64_msvc 0.48.0", + "windows_i686_gnu 0.48.0", + "windows_i686_msvc 0.48.0", + "windows_x86_64_gnu 0.48.0", "windows_x86_64_gnullvm", - "windows_x86_64_msvc 0.42.0", + "windows_x86_64_msvc 0.48.0", ] [[package]] name = "windows_aarch64_gnullvm" -version = "0.42.0" +version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41d2aa71f6f0cbe00ae5167d90ef3cfe66527d6f613ca78ac8024c3ccab9a19e" +checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc" [[package]] name = "windows_aarch64_msvc" @@ -1281,9 +1300,9 @@ checksum = "9bb8c3fd39ade2d67e9874ac4f3db21f0d710bee00fe7cab16949ec184eeaa47" [[package]] name = "windows_aarch64_msvc" -version = "0.42.0" +version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd0f252f5a35cac83d6311b2e795981f5ee6e67eb1f9a7f64eb4500fbc4dcdb4" +checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3" [[package]] name = "windows_i686_gnu" @@ -1299,9 +1318,9 @@ checksum = "180e6ccf01daf4c426b846dfc66db1fc518f074baa793aa7d9b9aaeffad6a3b6" [[package]] name = "windows_i686_gnu" -version = "0.42.0" +version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbeae19f6716841636c28d695375df17562ca208b2b7d0dc47635a50ae6c5de7" +checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241" [[package]] name = "windows_i686_msvc" @@ -1317,9 +1336,9 @@ checksum = "e2e7917148b2812d1eeafaeb22a97e4813dfa60a3f8f78ebe204bcc88f12f024" [[package]] name = "windows_i686_msvc" -version = "0.42.0" +version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "84c12f65daa39dd2babe6e442988fc329d6243fdce47d7d2d155b8d874862246" +checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00" [[package]] name = "windows_x86_64_gnu" @@ -1335,15 +1354,15 @@ checksum = "4dcd171b8776c41b97521e5da127a2d86ad280114807d0b2ab1e462bc764d9e1" [[package]] name = "windows_x86_64_gnu" -version = "0.42.0" +version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf7b1b21b5362cbc318f686150e5bcea75ecedc74dd157d874d754a2ca44b0ed" +checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1" [[package]] name = "windows_x86_64_gnullvm" -version = "0.42.0" +version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09d525d2ba30eeb3297665bd434a54297e4170c7f1a44cad4ef58095b4cd2028" +checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953" [[package]] name = "windows_x86_64_msvc" @@ -1359,9 +1378,9 @@ checksum = "c811ca4a8c853ef420abd8592ba53ddbbac90410fab6903b3e79972a631f7680" [[package]] name = "windows_x86_64_msvc" -version = "0.42.0" +version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f40009d85759725a34da6d89a94e63d7bdc50a862acf0dbc7c8e488f1edcb6f5" +checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a" [[package]] name = "xattr" diff --git a/Cargo.toml b/Cargo.toml index bca3f1c..58a961b 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -13,7 +13,7 @@ name = "site" [dependencies] axum = { version = "0.6.1" } hyper = { version = "0.14.21" } -tokio = { version = "1.23.0", features = ["full"] } +tokio = { version = "1.28.0", features = ["full"] } tracing = "0.1.37" tracing-subscriber = {version = "0.3.16", features = ["env-filter"] } tower-http = { version = "0.3.5", features = ["fs", "trace", "auth"] } From cc4b84c9d4eb6102125c01f405eacccbe427c9d3 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Sat, 29 Apr 2023 08:01:43 +0000 Subject: [PATCH 11/25] Update Rust crate uuid to 1.3.2 --- Cargo.lock | 4 ++-- Cargo.toml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index e8a47da..86e2894 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1093,9 +1093,9 @@ checksum = "6ceab39d59e4c9499d4e5a8ee0e2735b891bb7308ac83dfb4e80cad195c9f6f3" [[package]] name = "uuid" -version = "1.2.1" +version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "feb41e78f93363bb2df8b0e86a2ca30eed7806ea16ea0c790d757cf93f79be83" +checksum = "4dad5567ad0cf5b760e5665964bec1b47dfd077ba8a2544b513f3556d3d239a2" dependencies = [ "getrandom", ] diff --git a/Cargo.toml b/Cargo.toml index bca3f1c..8dfa81f 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -21,7 +21,7 @@ tar = "0.4.38" flate2 = "1.0.25" tokio-util = { version = "0.7.4", features = ["io"] } futures-util = "0.3.25" -uuid = { version = "1.2.1", features = ["v4"] } +uuid = { version = "1.3.2", features = ["v4"] } serde_json = "1.0.91" metrics = "0.20.1" metrics-exporter-prometheus = "0.11.0" From 5fa892f5a3cffce01cda2613366418544535c61d Mon Sep 17 00:00:00 2001 From: Chewing_Bever Date: Sat, 29 Apr 2023 15:41:51 +0200 Subject: [PATCH 12/25] fix: update code to work with newer versions --- src/main.rs | 37 ++++++++++--------------------------- 1 file changed, 10 insertions(+), 27 deletions(-) diff --git a/src/main.rs b/src/main.rs index cf75511..fdb0600 100644 --- a/src/main.rs +++ b/src/main.rs @@ -2,13 +2,14 @@ use std::{future::ready, net::SocketAddr}; use axum::{ extract::Extension, - http::StatusCode, middleware, response::Redirect, - routing::{any, get, get_service}, + routing::{any, get}, Router, }; -use tower_http::{auth::RequireAuthorizationLayer, services::ServeDir, trace::TraceLayer}; +use tower_http::{ + services::ServeDir, trace::TraceLayer, validate_request::ValidateRequestHeaderLayer, +}; use tracing_subscriber::{layer::SubscriberExt, util::SubscriberInitExt}; mod api; @@ -46,7 +47,7 @@ async fn main() { // Routes under /api path .nest( "/api", - api::router().layer(RequireAuthorizationLayer::bearer(&api_key)), + api::router().layer(ValidateRequestHeaderLayer::bearer(&api_key)), ) .route("/metrics", get(move || ready(recorder_handle.render()))); @@ -61,17 +62,7 @@ async fn main() { for (path, dir) in sites { let full_path = format!("{}/{}", static_dir, dir); - app = app.nest( - path, - get_service(ServeDir::new(full_path)).handle_error( - |error: std::io::Error| async move { - ( - StatusCode::INTERNAL_SERVER_ERROR, - format!("Unhandled internal error: {}", error), - ) - }, - ), - ); + app = app.nest_service(path, ServeDir::new(full_path)); } // Define some redirects @@ -90,18 +81,10 @@ async fn main() { app = app // The fallback option is to serve the actual static files - .fallback( - get_service(ServeDir::new(format!( - "{}/{}", - static_dir, DEFAULT_STATIC_SITE - ))) - .handle_error(|error: std::io::Error| async move { - ( - StatusCode::INTERNAL_SERVER_ERROR, - format!("Unhandled internal error: {}", error), - ) - }), - ) + .fallback_service(ServeDir::new(format!( + "{}/{}", + static_dir, DEFAULT_STATIC_SITE + ))) .layer(middleware::from_fn(metrics::track_metrics)) .layer(Extension(data_dir)) .layer(TraceLayer::new_for_http()); From fe5c1dc22e926f63b938f8dd60f922b33a55b447 Mon Sep 17 00:00:00 2001 From: Chewing_Bever Date: Sat, 29 Apr 2023 15:47:39 +0200 Subject: [PATCH 13/25] chore: update rust version --- .woodpecker/.build.yml | 7 +++++++ Dockerfile | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) create mode 100644 .woodpecker/.build.yml diff --git a/.woodpecker/.build.yml b/.woodpecker/.build.yml new file mode 100644 index 0000000..22ea77e --- /dev/null +++ b/.woodpecker/.build.yml @@ -0,0 +1,7 @@ +platform: 'linux/amd64' + +pipeline: + lint: + image: 'rustlang/rust:1.69' + commands: + - cargo build diff --git a/Dockerfile b/Dockerfile index d56f706..62ecb30 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM rust:1.64-alpine3.16 AS builder +FROM rust:1.69-alpine3.16 AS builder ARG DI_VER=1.2.5 From 88741d81e6c7ac972c034982adf837f31ea8906b Mon Sep 17 00:00:00 2001 From: Chewing_Bever Date: Sat, 29 Apr 2023 15:48:50 +0200 Subject: [PATCH 14/25] fix: correct docker image --- .woodpecker/.build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.woodpecker/.build.yml b/.woodpecker/.build.yml index 22ea77e..4f5bc7e 100644 --- a/.woodpecker/.build.yml +++ b/.woodpecker/.build.yml @@ -2,6 +2,6 @@ platform: 'linux/amd64' pipeline: lint: - image: 'rustlang/rust:1.69' + image: 'rustlang/rust:1.69-alpine3.16' commands: - cargo build From b79e34cb701c4ed5fe9b6f66c7131ddc049e26a3 Mon Sep 17 00:00:00 2001 From: Chewing_Bever Date: Sat, 29 Apr 2023 15:49:39 +0200 Subject: [PATCH 15/25] fix: yee --- .woodpecker/.build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.woodpecker/.build.yml b/.woodpecker/.build.yml index 4f5bc7e..3b0c3ec 100644 --- a/.woodpecker/.build.yml +++ b/.woodpecker/.build.yml @@ -1,7 +1,7 @@ platform: 'linux/amd64' pipeline: - lint: - image: 'rustlang/rust:1.69-alpine3.16' + build: + image: 'rust:1.69-alpine3.16' commands: - cargo build From 1e83db744b83c8889dfa9784be592e6909c0dbe6 Mon Sep 17 00:00:00 2001 From: Chewing_Bever Date: Sat, 29 Apr 2023 15:54:32 +0200 Subject: [PATCH 16/25] fix: een probeersel --- .woodpecker/.build.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.woodpecker/.build.yml b/.woodpecker/.build.yml index 3b0c3ec..a6bafed 100644 --- a/.woodpecker/.build.yml +++ b/.woodpecker/.build.yml @@ -4,4 +4,5 @@ pipeline: build: image: 'rust:1.69-alpine3.16' commands: + - apk add build-base - cargo build From 3c2485c6b5942d0832841cc7f2c93b8ab52ee0c8 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Sat, 29 Apr 2023 14:01:48 +0000 Subject: [PATCH 17/25] chore(deps): update rust crate axum to 0.6.17 --- Cargo.lock | 48 ++++++++++++++---------------------------------- Cargo.toml | 2 +- 2 files changed, 15 insertions(+), 35 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 567fabe..80d295d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -21,13 +21,13 @@ dependencies = [ [[package]] name = "async-trait" -version = "0.1.53" +version = "0.1.68" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed6aa3524a2dfcf9fe180c51eae2b58738348d819517ceadf95789c51fff7600" +checksum = "b9ccdd8f2a161be9bd5c023df56f1b2a0bd1d83872ae53b71a84a12c9bf6e842" dependencies = [ "proc-macro2", "quote", - "syn 1.0.103", + "syn 2.0.15", ] [[package]] @@ -38,9 +38,9 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" [[package]] name = "axum" -version = "0.6.1" +version = "0.6.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08b108ad2665fa3f6e6a517c3d80ec3e77d224c47d605167aefaa5d7ef97fa48" +checksum = "b70caf9f1b0c045f7da350636435b775a9733adf2df56e8aa2a29210fbc335d4" dependencies = [ "async-trait", "axum-core", @@ -64,16 +64,15 @@ dependencies = [ "sync_wrapper", "tokio", "tower", - "tower-http 0.3.5", "tower-layer", "tower-service", ] [[package]] name = "axum-core" -version = "0.3.0" +version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79b8558f5a0581152dc94dcd289132a1d377494bdeafcd41869b3258e3e2ad92" +checksum = "759fa577a247914fd3f7f76d62972792636412fbfd634cd452f6a385a74d2d2c" dependencies = [ "async-trait", "bytes", @@ -276,9 +275,9 @@ dependencies = [ [[package]] name = "http" -version = "0.2.7" +version = "0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff8670570af52249509a86f5e3e18a08c60b177071826898fde8997cf5f6bfbb" +checksum = "bd6effc99afb63425aff9b05836f029929e345a6148a14b7ecd5ab67af944482" dependencies = [ "bytes", "fnv", @@ -316,9 +315,9 @@ checksum = "c4a1e36c821dbe04574f602848a19f742f4fb3c98d40449f11bcad18d6b17421" [[package]] name = "hyper" -version = "0.14.21" +version = "0.14.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41a2df176f359a22aee9c8657e674f7aa54e9ba48b512a798e5ca36a1f51065c" +checksum = "ab302d72a6f11a3b910431ff93aae7e773078c769f0a3ef15fb9ec692ed147d4" dependencies = [ "bytes", "futures-channel", @@ -355,9 +354,9 @@ checksum = "35e70ee094dc02fd9c13fdad4940090f22dbd6ac7c9e7094a46cf0232a50bc7c" [[package]] name = "itoa" -version = "1.0.1" +version = "1.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1aab8fc367588b89dcee83ab0fd66b72b50b72fa1904d7095045ace2b0c81c35" +checksum = "453ad9f582a441959e5f0d088b02ce04cfe8d51a8eaf077f12ac6d3e94164ca6" [[package]] name = "js-sys" @@ -817,7 +816,7 @@ dependencies = [ "tar", "tokio", "tokio-util", - "tower-http 0.4.0", + "tower-http", "tracing", "tracing-subscriber", "uuid", @@ -978,25 +977,6 @@ dependencies = [ "tracing", ] -[[package]] -name = "tower-http" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f873044bf02dd1e8239e9c1293ea39dad76dc594ec16185d0a1bf31d8dc8d858" -dependencies = [ - "bitflags", - "bytes", - "futures-core", - "futures-util", - "http", - "http-body", - "http-range-header", - "pin-project-lite", - "tower", - "tower-layer", - "tower-service", -] - [[package]] name = "tower-http" version = "0.4.0" diff --git a/Cargo.toml b/Cargo.toml index fc359b1..c662c59 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -11,7 +11,7 @@ name = "site" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -axum = { version = "0.6.1" } +axum = { version = "0.6.17" } hyper = { version = "0.14.21" } tokio = { version = "1.28.0", features = ["full"] } tracing = "0.1.37" From 02747b83256c1d5a6c3f0073a9201c3330543a10 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Sat, 29 Apr 2023 14:01:51 +0000 Subject: [PATCH 18/25] chore(deps): update rust crate flate2 to 1.0.26 --- Cargo.lock | 8 ++++---- Cargo.toml | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 567fabe..2f88a36 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -163,9 +163,9 @@ dependencies = [ [[package]] name = "flate2" -version = "1.0.25" +version = "1.0.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8a2db397cb1c8772f31494cb8917e48cd1e64f0fa7efac59fbd741a0a8ce841" +checksum = "3b9429470923de8e8cbd4d2dc513535400b4b3fef0319fb5c4e1f520a7bef743" dependencies = [ "crc32fast", "miniz_oxide", @@ -520,9 +520,9 @@ dependencies = [ [[package]] name = "miniz_oxide" -version = "0.6.2" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b275950c28b37e794e8c55d88aeb5e139d0ce23fdbbeda68f8d7174abdf9e8fa" +checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7" dependencies = [ "adler", ] diff --git a/Cargo.toml b/Cargo.toml index fc359b1..f164bfc 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -18,7 +18,7 @@ tracing = "0.1.37" tracing-subscriber = {version = "0.3.16", features = ["env-filter"] } tower-http = { version = "0.4.0", features = ["fs", "trace", "auth"] } tar = "0.4.38" -flate2 = "1.0.25" +flate2 = "1.0.26" tokio-util = { version = "0.7.8", features = ["io"] } futures-util = "0.3.25" uuid = { version = "1.3.2", features = ["v4"] } From 3ac0b52441ef4c5c92ff5b5532a437ef85f45115 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Sat, 29 Apr 2023 14:01:55 +0000 Subject: [PATCH 19/25] chore(deps): update rust crate futures-util to 0.3.28 --- Cargo.lock | 18 +++++++++--------- Cargo.toml | 2 +- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 567fabe..4c251ff 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -198,19 +198,19 @@ dependencies = [ [[package]] name = "futures-core" -version = "0.3.25" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04909a7a7e4633ae6c4a9ab280aeb86da1236243a77b694a49eacd659a4bd3ac" +checksum = "4bca583b7e26f571124fe5b7561d49cb2868d79116cfa0eefce955557c6fee8c" [[package]] name = "futures-macro" -version = "0.3.25" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bdfb8ce053d86b91919aad980c220b1fb8401a9394410e1c289ed7e66b61835d" +checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" dependencies = [ "proc-macro2", "quote", - "syn 1.0.103", + "syn 2.0.15", ] [[package]] @@ -221,15 +221,15 @@ checksum = "21163e139fa306126e6eedaf49ecdb4588f939600f0b1e770f4205ee4b7fa868" [[package]] name = "futures-task" -version = "0.3.25" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ffb393ac5d9a6eaa9d3fdf37ae2776656b706e200c8e16b1bdb227f5198e6ea" +checksum = "76d3d132be6c0e6aa1534069c705a74a5997a356c0dc2f86a47765e5617c5b65" [[package]] name = "futures-util" -version = "0.3.25" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "197676987abd2f9cadff84926f410af1c183608d36641465df73ae8211dc65d6" +checksum = "26b01e40b772d54cf6c6d721c1d1abd0647a0106a12ecaa1c186273392a69533" dependencies = [ "futures-core", "futures-macro", diff --git a/Cargo.toml b/Cargo.toml index fc359b1..f353e33 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -20,7 +20,7 @@ tower-http = { version = "0.4.0", features = ["fs", "trace", "auth"] } tar = "0.4.38" flate2 = "1.0.25" tokio-util = { version = "0.7.8", features = ["io"] } -futures-util = "0.3.25" +futures-util = "0.3.28" uuid = { version = "1.3.2", features = ["v4"] } serde_json = "1.0.91" metrics = "0.20.1" From d295e0f02140d8e5729e927d20d06f09b8478287 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Sat, 29 Apr 2023 14:02:01 +0000 Subject: [PATCH 20/25] chore(deps): update rust crate serde_json to 1.0.96 --- Cargo.lock | 4 ++-- Cargo.toml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 567fabe..a1acb77 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -754,9 +754,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.91" +version = "1.0.96" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "877c235533714907a8c2464236f5c4b2a17262ef1bd71f38f35ea592c8da6883" +checksum = "057d394a50403bcac12672b2b18fb387ab6d289d957dab67dd201875391e52f1" dependencies = [ "itoa", "ryu", diff --git a/Cargo.toml b/Cargo.toml index fc359b1..73d749c 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -22,7 +22,7 @@ flate2 = "1.0.25" tokio-util = { version = "0.7.8", features = ["io"] } futures-util = "0.3.25" uuid = { version = "1.3.2", features = ["v4"] } -serde_json = "1.0.91" +serde_json = "1.0.96" metrics = "0.20.1" metrics-exporter-prometheus = "0.11.0" serde = { version = "1.0", features = ["derive"] } From 850ab0f42bbe65b23b45f64a3c24dda701b917a1 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Sat, 29 Apr 2023 14:02:04 +0000 Subject: [PATCH 21/25] chore(deps): update rust crate tracing-subscriber to 0.3.17 --- Cargo.lock | 18 ++++++++++++------ Cargo.toml | 2 +- 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 567fabe..2589cf3 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -692,11 +692,11 @@ dependencies = [ [[package]] name = "regex" -version = "1.5.5" +version = "1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a11647b6b25ff05a515cb92c365cec08801e83423a235b51e231e1808747286" +checksum = "af83e617f331cc6ae2da5443c602dfa5af81e517212d9d611a5b3ba1777b5370" dependencies = [ - "regex-syntax", + "regex-syntax 0.7.1", ] [[package]] @@ -705,7 +705,7 @@ version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132" dependencies = [ - "regex-syntax", + "regex-syntax 0.6.25", ] [[package]] @@ -714,6 +714,12 @@ version = "0.6.25" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f497285884f3fcff424ffc933e56d7cbca511def0c9831a7f9b5f6153e3cc89b" +[[package]] +name = "regex-syntax" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a5996294f19bd3aae0453a862ad728f60e6600695733dd5df01da90c54363a3c" + [[package]] name = "rustversion" version = "1.0.9" @@ -1082,9 +1088,9 @@ dependencies = [ [[package]] name = "tracing-subscriber" -version = "0.3.16" +version = "0.3.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6176eae26dd70d0c919749377897b54a9276bd7061339665dd68777926b5a70" +checksum = "30a651bc37f915e81f087d86e62a18eec5f79550c7faff886f7090b4ea757c77" dependencies = [ "matchers", "nu-ansi-term", diff --git a/Cargo.toml b/Cargo.toml index fc359b1..2863bcc 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -15,7 +15,7 @@ axum = { version = "0.6.1" } hyper = { version = "0.14.21" } tokio = { version = "1.28.0", features = ["full"] } tracing = "0.1.37" -tracing-subscriber = {version = "0.3.16", features = ["env-filter"] } +tracing-subscriber = {version = "0.3.17", features = ["env-filter"] } tower-http = { version = "0.4.0", features = ["fs", "trace", "auth"] } tar = "0.4.38" flate2 = "1.0.25" From 63b52af5e642dd9df59066d36fd8c18cf41cde5a Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Sat, 29 Apr 2023 15:01:44 +0000 Subject: [PATCH 22/25] chore(deps): update rust crate metrics to 0.21.0 --- Cargo.lock | 61 ++++++++++++++++++++++++++++++++++++++++++++---------- Cargo.toml | 2 +- 2 files changed, 51 insertions(+), 12 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 03ff5bc..f7d59e0 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -19,6 +19,17 @@ dependencies = [ "version_check", ] +[[package]] +name = "ahash" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2c99f64d1e06488f620f932677e24bc6e2897582980441ae90a671415bd7ec2f" +dependencies = [ + "cfg-if", + "once_cell", + "version_check", +] + [[package]] name = "async-trait" version = "0.1.68" @@ -261,7 +272,7 @@ version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" dependencies = [ - "ahash", + "ahash 0.7.6", ] [[package]] @@ -449,9 +460,20 @@ version = "0.20.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7b9b8653cec6897f73b519a43fba5ee3d50f62fe9af80b428accdcc093b4a849" dependencies = [ - "ahash", - "metrics-macros", - "portable-atomic", + "ahash 0.7.6", + "metrics-macros 0.6.0", + "portable-atomic 0.3.4", +] + +[[package]] +name = "metrics" +version = "0.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aa8ebbd1a9e57bbab77b9facae7f5136aea44c356943bf9a198f647da64285d6" +dependencies = [ + "ahash 0.8.3", + "metrics-macros 0.7.0", + "portable-atomic 1.2.0", ] [[package]] @@ -463,10 +485,10 @@ dependencies = [ "hyper", "indexmap", "ipnet", - "metrics", + "metrics 0.20.1", "metrics-util", "parking_lot", - "portable-atomic", + "portable-atomic 0.3.4", "quanta", "thiserror", "tokio", @@ -484,6 +506,17 @@ dependencies = [ "syn 1.0.103", ] +[[package]] +name = "metrics-macros" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ddece26afd34c31585c74a4db0630c376df271c285d682d1e55012197830b6df" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.15", +] + [[package]] name = "metrics-util" version = "0.14.0" @@ -493,10 +526,10 @@ dependencies = [ "crossbeam-epoch", "crossbeam-utils", "hashbrown 0.12.3", - "metrics", + "metrics 0.20.1", "num_cpus", "parking_lot", - "portable-atomic", + "portable-atomic 0.3.4", "quanta", "sketches-ddsketch", ] @@ -560,9 +593,9 @@ dependencies = [ [[package]] name = "once_cell" -version = "1.13.0" +version = "1.17.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "18a6dbe30758c9f83eb00cbea4ac95966305f5a7772f3f42ebfc7fc7eddbd8e1" +checksum = "b7e5500299e16ebb147ae15a00a942af264cf3688f47923b8fc2cd5858f23ad3" [[package]] name = "overload" @@ -637,6 +670,12 @@ version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "763095e04dcbeb889b2ab35296ecb18a20fe16b4e9877ce64aab73d8fd05a8c3" +[[package]] +name = "portable-atomic" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f602a0d1e09a48e4f8e8b4d4042e32807c3676da31f2ecabeac9f96226ec6c45" + [[package]] name = "proc-macro2" version = "1.0.56" @@ -815,7 +854,7 @@ dependencies = [ "flate2", "futures-util", "hyper", - "metrics", + "metrics 0.21.0", "metrics-exporter-prometheus", "serde", "serde_json", diff --git a/Cargo.toml b/Cargo.toml index b06ad05..d86ebe4 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -23,6 +23,6 @@ tokio-util = { version = "0.7.8", features = ["io"] } futures-util = "0.3.28" uuid = { version = "1.3.2", features = ["v4"] } serde_json = "1.0.96" -metrics = "0.20.1" +metrics = "0.21.0" metrics-exporter-prometheus = "0.11.0" serde = { version = "1.0", features = ["derive"] } From cf0e093763ba6974f8c154616e29d94c8fdba1e5 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Sun, 30 Apr 2023 13:04:45 +0000 Subject: [PATCH 23/25] chore(deps): update rust crate axum to 0.6.18 --- Cargo.lock | 4 ++-- Cargo.toml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 03ff5bc..417d2dc 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -38,9 +38,9 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" [[package]] name = "axum" -version = "0.6.17" +version = "0.6.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b70caf9f1b0c045f7da350636435b775a9733adf2df56e8aa2a29210fbc335d4" +checksum = "f8175979259124331c1d7bf6586ee7e0da434155e4b2d48ec2c8386281d8df39" dependencies = [ "async-trait", "axum-core", diff --git a/Cargo.toml b/Cargo.toml index b06ad05..90e3923 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -11,7 +11,7 @@ name = "site" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -axum = { version = "0.6.17" } +axum = { version = "0.6.18" } hyper = { version = "0.14.21" } tokio = { version = "1.28.0", features = ["full"] } tracing = "0.1.37" From 0d064d2715cbcdef03f2ed732f6e5bc2a3761772 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Sun, 30 Apr 2023 15:01:40 +0000 Subject: [PATCH 24/25] chore(deps): update rust crate hyper to 0.14.26 --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index e97cc2f..0c5fd4b 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -12,7 +12,7 @@ name = "site" [dependencies] axum = { version = "0.6.18" } -hyper = { version = "0.14.21" } +hyper = { version = "0.14.26" } tokio = { version = "1.28.0", features = ["full"] } tracing = "0.1.37" tracing-subscriber = {version = "0.3.17", features = ["env-filter"] } From a4fc897e4c93dce3246b3ffaf5d56093fa06ea2b Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Sun, 30 Apr 2023 15:01:43 +0000 Subject: [PATCH 25/25] chore(deps): update rust crate metrics-exporter-prometheus to 0.12.0 --- Cargo.lock | 85 ++++++++++++++---------------------------------------- Cargo.toml | 2 +- 2 files changed, 22 insertions(+), 65 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index c9944fc..f359cc8 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -8,17 +8,6 @@ version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" -[[package]] -name = "ahash" -version = "0.7.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fcb51a0695d8f838b1ee009b3fbf66bda078cd64590202a864a8f3e8c4315c47" -dependencies = [ - "getrandom", - "once_cell", - "version_check", -] - [[package]] name = "ahash" version = "0.8.3" @@ -268,11 +257,11 @@ checksum = "ab5ef0d4909ef3724cc8cce6ccc8572c5c817592e9285f5464f8e86f8bd3726e" [[package]] name = "hashbrown" -version = "0.12.3" +version = "0.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" +checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e" dependencies = [ - "ahash 0.7.6", + "ahash", ] [[package]] @@ -410,10 +399,10 @@ dependencies = [ ] [[package]] -name = "mach" -version = "0.3.2" +name = "mach2" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b823e83b2affd8f40a9ee8c29dbc56404c1e34cd2710921f2801e2cf29527afa" +checksum = "6d0d1830bcd151a6fc4aea1369af235b36c1528fe976b8ff678683c9995eade8" dependencies = [ "libc", ] @@ -454,58 +443,34 @@ dependencies = [ "autocfg", ] -[[package]] -name = "metrics" -version = "0.20.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b9b8653cec6897f73b519a43fba5ee3d50f62fe9af80b428accdcc093b4a849" -dependencies = [ - "ahash 0.7.6", - "metrics-macros 0.6.0", - "portable-atomic 0.3.4", -] - [[package]] name = "metrics" version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "aa8ebbd1a9e57bbab77b9facae7f5136aea44c356943bf9a198f647da64285d6" dependencies = [ - "ahash 0.8.3", - "metrics-macros 0.7.0", - "portable-atomic 1.2.0", + "ahash", + "metrics-macros", + "portable-atomic", ] [[package]] name = "metrics-exporter-prometheus" -version = "0.11.0" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8603921e1f54ef386189335f288441af761e0fc61bcb552168d9cedfe63ebc70" +checksum = "5142a593c2be0cf5c2ac5b22ec7a4f74477b851efb6238236af26c6b5ca6e98e" dependencies = [ "hyper", "indexmap", "ipnet", - "metrics 0.20.1", + "metrics", "metrics-util", - "parking_lot", - "portable-atomic 0.3.4", "quanta", "thiserror", "tokio", "tracing", ] -[[package]] -name = "metrics-macros" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "731f8ecebd9f3a4aa847dfe75455e4757a45da40a7793d2f0b1f9b6ed18b23f3" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.103", -] - [[package]] name = "metrics-macros" version = "0.7.0" @@ -519,17 +484,15 @@ dependencies = [ [[package]] name = "metrics-util" -version = "0.14.0" +version = "0.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7d24dc2dbae22bff6f1f9326ffce828c9f07ef9cc1e8002e5279f845432a30a" +checksum = "111cb375987443c3de8d503580b536f77dc8416d32db62d9456db5d93bd7ac47" dependencies = [ "crossbeam-epoch", "crossbeam-utils", - "hashbrown 0.12.3", - "metrics 0.20.1", + "hashbrown 0.13.2", + "metrics", "num_cpus", - "parking_lot", - "portable-atomic 0.3.4", "quanta", "sketches-ddsketch", ] @@ -664,12 +627,6 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" -[[package]] -name = "portable-atomic" -version = "0.3.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "763095e04dcbeb889b2ab35296ecb18a20fe16b4e9877ce64aab73d8fd05a8c3" - [[package]] name = "portable-atomic" version = "1.2.0" @@ -687,16 +644,16 @@ dependencies = [ [[package]] name = "quanta" -version = "0.10.1" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7e31331286705f455e56cca62e0e717158474ff02b7936c1fa596d983f4ae27" +checksum = "8cc73c42f9314c4bdce450c77e6f09ecbddefbeddb1b5979ded332a3913ded33" dependencies = [ "crossbeam-utils", "libc", - "mach", + "mach2", "once_cell", "raw-cpuid", - "wasi 0.10.2+wasi-snapshot-preview1", + "wasi 0.11.0+wasi-snapshot-preview1", "web-sys", "winapi", ] @@ -854,7 +811,7 @@ dependencies = [ "flate2", "futures-util", "hyper", - "metrics 0.21.0", + "metrics", "metrics-exporter-prometheus", "serde", "serde_json", diff --git a/Cargo.toml b/Cargo.toml index e97cc2f..f1587ec 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -24,5 +24,5 @@ futures-util = "0.3.28" uuid = { version = "1.3.2", features = ["v4"] } serde_json = "1.0.96" metrics = "0.21.0" -metrics-exporter-prometheus = "0.11.0" +metrics-exporter-prometheus = "0.12.0" serde = { version = "1.0", features = ["derive"] }