From 4b83f5c5259848b92d1d69cc5403360228e0b059 Mon Sep 17 00:00:00 2001 From: Congyu WANG Date: Wed, 7 Aug 2024 15:21:08 +0800 Subject: [PATCH 1/2] update clap version --- pingora-core/Cargo.toml | 4 ++-- pingora-core/src/server/configuration/mod.rs | 2 +- pingora-proxy/Cargo.toml | 4 ++-- pingora/Cargo.toml | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pingora-core/Cargo.toml b/pingora-core/Cargo.toml index c5bce77e2..c5d99102b 100644 --- a/pingora-core/Cargo.toml +++ b/pingora-core/Cargo.toml @@ -36,7 +36,7 @@ log = { workspace = true } h2 = { workspace = true } lru = { workspace = true } nix = "~0.24.3" -clap = { version = "3.2.25", features = ["derive"] } +clap = { version = "4.5", features = ["derive"] } once_cell = { workspace = true } serde = { version = "1.0", features = ["derive"] } serde_yaml = "0.8" @@ -81,4 +81,4 @@ jemallocator = "0.5" default = ["openssl"] openssl = ["pingora-openssl"] boringssl = ["pingora-boringssl"] -patched_http1 = [] \ No newline at end of file +patched_http1 = [] diff --git a/pingora-core/src/server/configuration/mod.rs b/pingora-core/src/server/configuration/mod.rs index 5174d4072..0a5f8a0a0 100644 --- a/pingora-core/src/server/configuration/mod.rs +++ b/pingora-core/src/server/configuration/mod.rs @@ -137,7 +137,7 @@ pub struct Opt { /// Not actually used. This flag is there so that the server is not upset seeing this flag /// passed from `cargo test` sometimes - #[clap(long, hidden = true)] + #[clap(long, hide = true)] pub nocapture: bool, /// Test the configuration and exit diff --git a/pingora-proxy/Cargo.toml b/pingora-proxy/Cargo.toml index 0a52dffdb..432442532 100644 --- a/pingora-proxy/Cargo.toml +++ b/pingora-proxy/Cargo.toml @@ -31,7 +31,7 @@ async-trait = { workspace = true } log = { workspace = true } h2 = { workspace = true } once_cell = { workspace = true } -clap = { version = "3.2.25", features = ["derive"] } +clap = { version = "4.5", features = ["derive"] } regex = "1" [dev-dependencies] @@ -61,4 +61,4 @@ boringssl = ["pingora-core/boringssl", "pingora-cache/boringssl"] rustdoc-args = ["--cfg", "doc_async_trait"] [lints.rust] -unexpected_cfgs = { level = "warn", check-cfg = ['cfg(doc_async_trait)'] } \ No newline at end of file +unexpected_cfgs = { level = "warn", check-cfg = ['cfg(doc_async_trait)'] } diff --git a/pingora/Cargo.toml b/pingora/Cargo.toml index 7f5e10118..4c88cb3e2 100644 --- a/pingora/Cargo.toml +++ b/pingora/Cargo.toml @@ -30,7 +30,7 @@ pingora-proxy = { version = "0.3.0", path = "../pingora-proxy", optional = true, pingora-cache = { version = "0.3.0", path = "../pingora-cache", optional = true, default-features = false } [dev-dependencies] -clap = { version = "3.2.25", features = ["derive"] } +clap = { version = "4.5", features = ["derive"] } tokio = { workspace = true, features = ["rt-multi-thread", "signal"] } matches = "0.1" env_logger = "0.9" From 5dcb77e78bc52eedfe4f8a563f9337b1968c5182 Mon Sep 17 00:00:00 2001 From: Congyu WANG Date: Wed, 7 Aug 2024 15:48:58 +0800 Subject: [PATCH 2/2] downgrade to v4.4 for MSRV --- pingora-core/Cargo.toml | 2 +- pingora-proxy/Cargo.toml | 2 +- pingora/Cargo.toml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pingora-core/Cargo.toml b/pingora-core/Cargo.toml index c5d99102b..95fdc9986 100644 --- a/pingora-core/Cargo.toml +++ b/pingora-core/Cargo.toml @@ -36,7 +36,7 @@ log = { workspace = true } h2 = { workspace = true } lru = { workspace = true } nix = "~0.24.3" -clap = { version = "4.5", features = ["derive"] } +clap = { version = "4.4", features = ["derive"] } once_cell = { workspace = true } serde = { version = "1.0", features = ["derive"] } serde_yaml = "0.8" diff --git a/pingora-proxy/Cargo.toml b/pingora-proxy/Cargo.toml index 432442532..b386a0f24 100644 --- a/pingora-proxy/Cargo.toml +++ b/pingora-proxy/Cargo.toml @@ -31,7 +31,7 @@ async-trait = { workspace = true } log = { workspace = true } h2 = { workspace = true } once_cell = { workspace = true } -clap = { version = "4.5", features = ["derive"] } +clap = { version = "4.4", features = ["derive"] } regex = "1" [dev-dependencies] diff --git a/pingora/Cargo.toml b/pingora/Cargo.toml index 4c88cb3e2..450674300 100644 --- a/pingora/Cargo.toml +++ b/pingora/Cargo.toml @@ -30,7 +30,7 @@ pingora-proxy = { version = "0.3.0", path = "../pingora-proxy", optional = true, pingora-cache = { version = "0.3.0", path = "../pingora-cache", optional = true, default-features = false } [dev-dependencies] -clap = { version = "4.5", features = ["derive"] } +clap = { version = "4.4", features = ["derive"] } tokio = { workspace = true, features = ["rt-multi-thread", "signal"] } matches = "0.1" env_logger = "0.9"